Commit 7d72e15c authored by Cage, Gregory's avatar Cage, Gregory
Browse files

Merge branch '129-stop-job-outputs' into 'dev' 

Only send kill signal when stopping jobs instead of using states

Closes #129

See merge request !106
parents 902025e0 872d27a3

lib/galaxy/managers/jobs.py

+0 −5
Original line number Diff line number Diff line
@@ -336,13 +336,8 @@ class JobManager: 
    def finish_early(self, job):

        if not job.finished:

            try:

                job.mark_stopped(self.app.config.track_jobs_in_database)

                job_wrapper = self.app.job_manager.job_handler.job_queue.job_wrapper(job)

                self.app.job_manager.job_handler.dispatcher.stop(job, job_wrapper, soft_kill=True)

                session = self.app.model.session

                with transaction(session):

                    session.commit()

                self.app.job_manager.stop(job, message="")

                return True

            except Exception as e:

                log.error("Job Runner does not support stopping job early.")