1 new commit in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/6c3758595bc9/ Changeset: 6c3758595bc9 User: natefoo Date: 2014-06-19 16:18:55 Summary: Use the destination params from the job record when creating a job wrapper for LWR status updates. Affected #: 2 files diff -r a6729bbd904a2ad44544f9f7077e663482f89309 -r 6c3758595bc9b030dfbe1ba533add122bac86e49 lib/galaxy/jobs/__init__.py --- a/lib/galaxy/jobs/__init__.py +++ b/lib/galaxy/jobs/__init__.py @@ -61,6 +61,12 @@ self['resubmit'] = [] # dict is appropriate (rather than a bunch) since keys may not be valid as attributes self['params'] = dict() + + # Use the values persisted in an existing job + if 'from_job' in kwds and kwds['from_job'].destination_id is not None: + self['id'] = kwds['from_job'].destination_id + self['params'] = kwds['from_job'].destination_params + super(JobDestination, self).__init__(**kwds) # Store tags as a list @@ -679,7 +685,7 @@ Wraps a 'model.Job' with convenience methods for running processes and state management. """ - def __init__( self, job, queue ): + def __init__( self, job, queue, use_persisted_destination=False ): self.job_id = job.id self.session_id = job.session_id self.user_id = job.user_id @@ -713,6 +719,8 @@ self.params = None if job.params: self.params = from_json_string( job.params ) + if use_persisted_destination: + self.job_runner_mapper.cached_job_destination = JobDestination( from_job=job ) self.__user_system_pwent = None self.__galaxy_system_pwent = None diff -r a6729bbd904a2ad44544f9f7077e663482f89309 -r 6c3758595bc9b030dfbe1ba533add122bac86e49 lib/galaxy/jobs/handler.py --- a/lib/galaxy/jobs/handler.py +++ b/lib/galaxy/jobs/handler.py @@ -84,12 +84,12 @@ self.monitor_thread.start() log.info( "job handler queue started" ) - def job_wrapper( self, job ): - return JobWrapper( job, self ) + def job_wrapper( self, job, use_persisted_destination=False ): + return JobWrapper( job, self, use_persisted_destination=use_persisted_destination ) def job_pair_for_id( self, id ): job = self.sa_session.query( model.Job ).get( id ) - return job, self.job_wrapper( job ) + return job, self.job_wrapper( job, use_persisted_destination=True ) def __check_jobs_at_startup( self ): """ Repository URL: https://bitbucket.org/galaxy/galaxy-central/ -- This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email.