diff options
Diffstat (limited to 'Tools/Scripts/webkitpy/tool/commands/queues.py')
| -rw-r--r-- | Tools/Scripts/webkitpy/tool/commands/queues.py | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/Tools/Scripts/webkitpy/tool/commands/queues.py b/Tools/Scripts/webkitpy/tool/commands/queues.py index 62d429d88..edfbee402 100644 --- a/Tools/Scripts/webkitpy/tool/commands/queues.py +++ b/Tools/Scripts/webkitpy/tool/commands/queues.py @@ -28,6 +28,7 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. import codecs +import logging import os import sys import time @@ -41,7 +42,6 @@ from webkitpy.common.config.committervalidator import CommitterValidator from webkitpy.common.config.ports import DeprecatedPort from webkitpy.common.net.bugzilla import Attachment from webkitpy.common.net.statusserver import StatusServer -from webkitpy.common.system.deprecated_logging import error, log from webkitpy.common.system.executive import ScriptError from webkitpy.tool.bot.botinfo import BotInfo from webkitpy.tool.bot.commitqueuetask import CommitQueueTask, CommitQueueTaskDelegate @@ -55,6 +55,8 @@ from webkitpy.tool.bot.stylequeuetask import StyleQueueTask, StyleQueueTaskDeleg from webkitpy.tool.commands.stepsequence import StepSequenceErrorHandler from webkitpy.tool.multicommandtool import Command, TryAgain +_log = logging.getLogger(__name__) + class AbstractQueue(Command, QueueEngineDelegate): watchers = [ @@ -78,7 +80,7 @@ class AbstractQueue(Command, QueueEngineDelegate): self._tool.bugs.add_cc_to_bug(bug_id, self.watchers) except Exception, e: traceback.print_exc() - log("Failed to CC watchers.") + _log.error("Failed to CC watchers.") def run_webkit_patch(self, args): webkit_patch_args = [self._tool.path()] @@ -111,12 +113,13 @@ class AbstractQueue(Command, QueueEngineDelegate): raise NotImplementedError, "subclasses must implement" def begin_work_queue(self): - log("CAUTION: %s will discard all local changes in \"%s\"" % (self.name, self._tool.scm().checkout_root)) + _log.info("CAUTION: %s will discard all local changes in \"%s\"" % (self.name, self._tool.scm().checkout_root)) if self._options.confirm: response = self._tool.user.prompt("Are you sure? Type \"yes\" to continue: ") if (response != "yes"): - error("User declined.") - log("Running WebKit %s." % self.name) + _log.error("User declined.") + sys.exit(1) + _log.info("Running WebKit %s." % self.name) self._tool.status_server.update_status(self.name, "Starting Queue") def stop_work_queue(self, reason): @@ -193,7 +196,7 @@ class FeederQueue(AbstractQueue): return None def handle_unexpected_error(self, work_item, message): - log(message) + _log.error(message) class AbstractPatchQueue(AbstractQueue): @@ -357,7 +360,7 @@ class CommitQueue(AbstractPatchQueue, StepSequenceErrorHandler, CommitQueueTaskD # Hitting this error handler should be pretty rare. It does occur, # however, when a patch no longer applies to top-of-tree in the final # land step. - log(script_error.message_with_output()) + _log.error(script_error.message_with_output()) @classmethod def handle_checkout_needs_update(cls, tool, state, options, error): @@ -405,13 +408,13 @@ class AbstractReviewQueue(AbstractPatchQueue, StepSequenceErrorHandler): raise e def handle_unexpected_error(self, patch, message): - log(message) + _log.error(message) # StepSequenceErrorHandler methods @classmethod def handle_script_error(cls, tool, state, script_error): - log(script_error.output) + _log.error(script_error.output) class StyleQueue(AbstractReviewQueue, StyleQueueTaskDelegate): |