opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-09-21 13:50:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

Reverted some logging changes since James pointed out their redundancy.

Browse Source
This commit is contained in:
Greg Von Kuster
2007-09-28 19:36:49 +00:00
parent 882d6d6aef
commit 19d06f68a0
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/galaxy/jobs/__init__.py
+6 -6
View File
@@ -97,8 +97,8 @@ class JobQueue( object ):
while self.running:
try:
self.monitor_step()
except Exception, exc:
log.exception( "Exception in monitor_step: %s" %str( exc ))
except:
log.exception( "Exception in monitor_step" )
# Sleep
self.sleeper.sleep( 1 )
@@ -147,8 +147,8 @@ class JobQueue( object ):
log.debug( "job %d dispatched" %job.job_id)
else:
log.error( "unknown job state '%s' for job %d" %( job_state, job.job_id ))
except Exception, exc:
log.exception("failure running job %d, error: %s" %( job.job_id, str( exc )))
except:
log.exception( "failure running job %d" %job.job_id )
# Update the waiting list
self.waiting = new_waiting
@@ -163,9 +163,9 @@ class JobQueue( object ):
log.debug( "job %d dispatched" %sjob.job_id )
except Empty : # squeue is empty, so stop dispatching
break
except Exception, exc: # if something else breaks while dispatching
except: # if something else breaks while dispatching
job.fail( "failure dispatching job" )
log.exception("failure running job %d, error: %s" %( sjob.job_id, str( exc )))
log.exception( "failure running job %d" %sjob.job_id )
def put( self, job_id, tool ):
"""Add a job to the queue (by job identifier)"""
lib/galaxy/jobs/runners/local.py
+3 -3
View File
@@ -43,9 +43,9 @@ class LocalJobRunner( object ):
try:
job_wrapper.prepare()
command_line = job_wrapper.get_command_line()
except Exception, exc:
except:
job_wrapper.fail( "failure preparing job", exception=True )
log.exception("failure running job %d, error: %s" %( job_wrapper.job_id, str( exc )))
log.exception("failure running job %d" % job_wrapper.job_id)
return
# If we were able to get a command line, run the job
if command_line:
@@ -62,7 +62,7 @@ class LocalJobRunner( object ):
log.debug('execution finished: %s' % command_line)
except Exception, exc:
job_wrapper.fail( "failure running job", exception=True )
log.exception("failure running job %d, error: %s" %( job_wrapper.job_id, str( exc )))
log.exception("failure running job %d" % job_wrapper.job_id)
return
# Finish the job
job_wrapper.finish( stdout, stderr )