details: http://www.bx.psu.edu/hg/galaxy/rev/a5ec5ab6144b changeset: 1632:a5ec5ab6144b user: Nate Coraor nate@bx.psu.edu date: Thu Nov 13 19:19:03 2008 -0500 description: Some job runner fixes.
2 file(s) affected in this change:
lib/galaxy/jobs/__init__.py lib/galaxy/jobs/runners/pbs.py
diffs (37 lines):
diff -r a39afe99b3bd -r a5ec5ab6144b lib/galaxy/jobs/__init__.py --- a/lib/galaxy/jobs/__init__.py Thu Nov 13 15:17:42 2008 -0500 +++ b/lib/galaxy/jobs/__init__.py Thu Nov 13 19:19:03 2008 -0500 @@ -64,7 +64,7 @@ """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 @@ 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 -r a39afe99b3bd -r a5ec5ab6144b lib/galaxy/jobs/runners/pbs.py --- a/lib/galaxy/jobs/runners/pbs.py Thu Nov 13 15:17:42 2008 -0500 +++ b/lib/galaxy/jobs/runners/pbs.py Thu Nov 13 19:19:03 2008 -0500 @@ -267,7 +267,10 @@ 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 )