Revert "Store metadata about updates in a file alongside with payload."
This has a bug in it that returns bad payloads during testing if the devserver isn't used with --clear_cache. Will fix Wednesday but reverting to be on the safe side.
This reverts commit 8dd80095daf198068d4cf1e3623936b0245251b9
Change-Id: I0a4b730cdde1b17feb587d1ae216b6cfb6864f5c
Reviewed-on: https://gerrit.chromium.org/gerrit/41730
Reviewed-by: Chris Sosa <sosa@chromium.org>
Tested-by: Chris Sosa <sosa@chromium.org>
diff --git a/log_util.py b/log_util.py
index 241fcfa..8b608a9 100644
--- a/log_util.py
+++ b/log_util.py
@@ -13,13 +13,13 @@
"""Provides a log method, with automatic log tag generation."""
_CAMELCASE_RE = re.compile('(?<=.)([A-Z])')
- def _Log(self, message, *args):
+ def _Log(self, message, *args, **kwargs):
return LogWithTag(
self._CAMELCASE_RE.sub(r'_\1', self.__class__.__name__).upper(),
- message, *args)
+ message, *args, **kwargs)
-def LogWithTag(tag, message, *args):
- # CherryPy log doesn't seem to take any optional args, so we just handle
- # args by formatting them into message.
- return cherrypy.log(message % args, context=tag)
+def LogWithTag(tag, message, *args, **kwargs):
+ # CherryPy log doesn't seem to take any optional args, so we'll just join
+ # them into a single string, if any are provided.
+ return cherrypy.log(message + ((' ' + ' '.join(args)) if args else ''), tag)