diff options
Diffstat (limited to 'WebKitTools/Scripts/webkitpy/tool/bot/queueengine.py')
| -rw-r--r-- | WebKitTools/Scripts/webkitpy/tool/bot/queueengine.py | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/WebKitTools/Scripts/webkitpy/tool/bot/queueengine.py b/WebKitTools/Scripts/webkitpy/tool/bot/queueengine.py index 36cbc5f..289dc4a 100644 --- a/WebKitTools/Scripts/webkitpy/tool/bot/queueengine.py +++ b/WebKitTools/Scripts/webkitpy/tool/bot/queueengine.py @@ -33,7 +33,6 @@ import traceback from datetime import datetime, timedelta -from webkitpy.common.net.statusserver import StatusServer from webkitpy.common.system.executive import ScriptError from webkitpy.common.system.deprecated_logging import log, OutputTee @@ -117,10 +116,10 @@ class QueueEngine: message = "Unexpected failure when processing patch! Please file a bug against webkit-patch.\n%s" % e.message_with_output() self._delegate.handle_unexpected_error(work_item, message) except TerminateQueue, e: - log("\nTerminateQueue exception received.") + self._stopping("TerminateQueue exception received.") return 0 except KeyboardInterrupt, e: - log("\nUser terminated queue.") + self._stopping("User terminated queue.") return 1 except Exception, e: traceback.print_exc() @@ -129,6 +128,13 @@ class QueueEngine: # Never reached. self._ensure_work_log_closed() + def _stopping(self, message): + log("\n%s" % message) + self._delegate.stop_work_queue(message) + # Be careful to shut down our OutputTee or the unit tests will be unhappy. + self._ensure_work_log_closed() + self._output_tee.remove_log(self._queue_log) + def _begin_logging(self): self._queue_log = self._output_tee.add_log(self._delegate.queue_log_path()) self._work_log = None |