Only count jobs in queue or running

Improve grepping for number of jobs (running/queued) in queues
HiSPARC · Apr 15, 2014 · d78912b · d78912b
1 parent 31565a4
commit d78912b
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/sapphire/corsika/qsub_corsika b/sapphire/corsika/qsub_corsika
@@ -269,12 +269,12 @@ def check_queue(queue):
     :return: boolean, True if slots are available, False otherwise.
 
     """
-    all_jobs = int(subprocess.check_output('qstat | grep {queue} | grep [QR] |'
-                                           ' wc -l' .format(queue=queue),
-                                           shell=True))
-    user_jobs = int(subprocess.check_output('qstat -u $USER | grep {queue}'
-                                            ' | wc -l'.format(queue=queue),
-                                            shell=True))
+    all_jobs = int(subprocess.check_output('qstat | grep {queue} | '
+                                           'grep " [QR] " | wc -l'
+                                           .format(queue=queue), shell=True))
+    user_jobs = int(subprocess.check_output('qstat -u $USER | grep {queue} | '
+                                            'grep " [QR] " | wc -l'
+                                            .format(queue=queue), shell=True))
 
     if queue == 'express':
         return 2 - user_jobs