2 new commits in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/5db75eaf0661/ Changeset: 5db75eaf0661 Branch: next-stable User: dannon Date: 2014-06-02 17:14:18 Summary: Cleanly terminate the control worker. Resolves a buildbot issue. Affected #: 2 files diff -r aeacb40b527f06eb7dc4138ab871b26a88b8d709 -r 5db75eaf06614909c09a6bbd70fe6f18007a39a8 lib/galaxy/app.py --- a/lib/galaxy/app.py +++ b/lib/galaxy/app.py @@ -159,6 +159,8 @@ self.heartbeat.shutdown() if self.update_manager: self.update_manager.shutdown() + if self.control_worker: + self.control_worker.shutdown() try: # If the datatypes registry was persisted, attempt to # remove the temporary file in which it was written. diff -r aeacb40b527f06eb7dc4138ab871b26a88b8d709 -r 5db75eaf06614909c09a6bbd70fe6f18007a39a8 lib/galaxy/queue_worker.py --- a/lib/galaxy/queue_worker.py +++ b/lib/galaxy/queue_worker.py @@ -63,6 +63,9 @@ log.warning("Recieved a malformed task message:\n%s" % body) message.ack() + def shutdown(self): + self.should_stop = True + def send_control_task(trans, task, noop_self=False, kwargs={}): log.info("Sending %s control task." % task) https://bitbucket.org/galaxy/galaxy-central/commits/8caa7f4d72c7/ Changeset: 8caa7f4d72c7 User: dannon Date: 2014-06-02 17:14:30 Summary: Merge next-stable. Affected #: 2 files diff -r db4083ef9b77ee8896a164c0120fc16914c6f8d5 -r 8caa7f4d72c7abe021ce5312bda46a3118ff68d8 lib/galaxy/app.py --- a/lib/galaxy/app.py +++ b/lib/galaxy/app.py @@ -159,6 +159,8 @@ self.heartbeat.shutdown() if self.update_manager: self.update_manager.shutdown() + if self.control_worker: + self.control_worker.shutdown() try: # If the datatypes registry was persisted, attempt to # remove the temporary file in which it was written. diff -r db4083ef9b77ee8896a164c0120fc16914c6f8d5 -r 8caa7f4d72c7abe021ce5312bda46a3118ff68d8 lib/galaxy/queue_worker.py --- a/lib/galaxy/queue_worker.py +++ b/lib/galaxy/queue_worker.py @@ -63,6 +63,9 @@ log.warning("Recieved a malformed task message:\n%s" % body) message.ack() + def shutdown(self): + self.should_stop = True + def send_control_task(trans, task, noop_self=False, kwargs={}): log.info("Sending %s control task." % task) 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.