From 14fc955efc4c3ea694f0dcde23fd59fbdaf4fca0 Mon Sep 17 00:00:00 2001 From: Nate Coraor Date: Thu, 13 Nov 2008 19:19:03 -0500 Subject: [PATCH] Some job runner fixes. --- lib/galaxy/jobs/__init__.py | 5 +++-- lib/galaxy/jobs/runners/pbs.py | 5 ++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/lib/galaxy/jobs/__init__.py b/lib/galaxy/jobs/__init__.py index 8ce4e3feebc..af7a0cd1dc8 100644 --- a/lib/galaxy/jobs/__init__.py +++ b/lib/galaxy/jobs/__init__.py @@ -64,7 +64,7 @@ class JobQueue( object ): """Start the job manager""" self.app = app # Should we use IPC to communicate (needed if forking) - self.track_jobs_in_database = app.config.get( 'track_jobs_in_database', False ) + self.track_jobs_in_database = app.config.get_bool( 'track_jobs_in_database', False ) # Check if any special scheduling policy should be used. If not, default is FIFO. sched_policy = app.config.get('job_scheduler_policy', 'FIFO') @@ -107,7 +107,8 @@ class JobQueue( object ): self.monitor_thread = threading.Thread( target=self.monitor ) self.monitor_thread.start() log.info( "job manager started" ) - self.check_jobs_at_startup() + if self.track_jobs_in_database: + self.check_jobs_at_startup() def check_jobs_at_startup( self ): """ diff --git a/lib/galaxy/jobs/runners/pbs.py b/lib/galaxy/jobs/runners/pbs.py index 53b6d4bb4c0..56292a74656 100644 --- a/lib/galaxy/jobs/runners/pbs.py +++ b/lib/galaxy/jobs/runners/pbs.py @@ -267,7 +267,10 @@ class PBSJobRunner( object ): except Empty: pass # Iterate over the list of watched jobs and check state - self.check_watched_items() + try: + self.check_watched_items() + except: + log.exception( "Uncaught exception checking jobs" ) # Sleep a bit before the next state check time.sleep( 1 )