diff --git a/lib/galaxy/jobs/__init__.py b/lib/galaxy/jobs/__init__.py index 8ff1ddfcf2b..827b478525a 100644 --- a/lib/galaxy/jobs/__init__.py +++ b/lib/galaxy/jobs/__init__.py @@ -976,8 +976,6 @@ class TaskWrapper(JobWrapper): def set_runner( self, runner_url, external_id ): task = self.get_task() self.sa_session.refresh( task ) - # DELETEME: - #log.debug( "************** Setting task %d runner name to %s" % ( task.get_id(), runner_url ) ) task.task_runner_name = runner_url task.task_runner_external_id = external_id # DBTODO Check task job_runner_stuff diff --git a/lib/galaxy/jobs/handler.py b/lib/galaxy/jobs/handler.py index e33e4f1345b..55ffe39c165 100644 --- a/lib/galaxy/jobs/handler.py +++ b/lib/galaxy/jobs/handler.py @@ -392,9 +392,6 @@ class DefaultJobDispatcher( object ): runner_name = "tasks" else: runner_name = ( job_wrapper.get_job_runner_url().split(":", 1) )[0] - # DELETEME - #log.debug( "__get_runner_name: runner_name = %s; URL: %s" - # % (runner_name, job_wrapper.get_job_runner_url()) ) return runner_name def put( self, job_wrapper ): @@ -419,8 +416,6 @@ class DefaultJobDispatcher( object ): # Note that Jobs and Tasks have runner_names, which are distinct from # the job_runner_name and task_runner_name. - # DELETEME - this next block is for debug only. - log.debug( "DefaultJobDispatcher: Stopping job %d" % job.get_id() ) if ( isinstance( job, model.Job ) ): log.debug( "Stopping job %d:", job.get_id() ) elif( isinstance( job, model.Task ) ): diff --git a/lib/galaxy/jobs/runners/local.py b/lib/galaxy/jobs/runners/local.py index cf348d6377f..c1e76e56bc3 100644 --- a/lib/galaxy/jobs/runners/local.py +++ b/lib/galaxy/jobs/runners/local.py @@ -87,9 +87,6 @@ class LocalJobRunner( BaseJobRunner ): stderr = stderr_file, env = os.environ, preexec_fn = os.setpgrp ) - # DELETEME (debug): - log.debug( "Job %s: PID %d" - % ( job_wrapper.get_id_tag(), proc.pid ) ) job_wrapper.set_runner( 'local:///', proc.pid ) job_wrapper.change_state( model.Job.states.RUNNING ) if self.app.config.output_size_limit > 0: diff --git a/lib/galaxy/jobs/runners/tasks.py b/lib/galaxy/jobs/runners/tasks.py index 1f7bc6945bb..c016bdad132 100644 --- a/lib/galaxy/jobs/runners/tasks.py +++ b/lib/galaxy/jobs/runners/tasks.py @@ -103,9 +103,6 @@ class TaskedJobRunner( object ): count_complete = 0 tasks_complete = True for tw in task_wrappers: -# # DELETEME - debug -# log.debug( "Checking task wrapper %d; tasks_complete = %s" -# % (tw.task_id, tasks_complete) ) task_state = tw.get_state() if ( model.Task.states.ERROR == task_state ): log.debug( "Canceling job %d: Task %d returned an error"