From d3d742ade0cdfdc9ea58b79f402ed1d215e5a645 Mon Sep 17 00:00:00 2001 From: Nate Coraor Date: Tue, 11 Nov 2008 10:19:21 -0500 Subject: [PATCH] Add the "upload" job state to prevent job runner from grabbing upload jobs when tracking in the database. --- lib/galaxy/model/__init__.py | 1 + lib/galaxy/tools/actions/upload.py | 1 + 2 files changed, 2 insertions(+) diff --git a/lib/galaxy/model/__init__.py b/lib/galaxy/model/__init__.py index 1b0c3cef020..9a6cb2e1d3e 100644 --- a/lib/galaxy/model/__init__.py +++ b/lib/galaxy/model/__init__.py @@ -46,6 +46,7 @@ class Job( object ): parameters, and output datasets. """ states = Bunch( NEW = 'new', + UPLOAD = 'upload', WAITING = 'waiting', QUEUED = 'queued', RUNNING = 'running', diff --git a/lib/galaxy/tools/actions/upload.py b/lib/galaxy/tools/actions/upload.py index 8bb44077c7b..39b1c2e168e 100644 --- a/lib/galaxy/tools/actions/upload.py +++ b/lib/galaxy/tools/actions/upload.py @@ -38,6 +38,7 @@ class UploadToolAction( object ): job.tool_version = tool.version except: job.tool_version = "1.0.0" + job.state = trans.app.model.Job.states.UPLOAD job.flush() log.info( 'tool %s created job id %d' % ( tool.id, job.id ) ) trans.log_event( 'created job id %d' % job.id, tool_id=tool.id )