Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1247)

Unified Diff: media/tools/constrained_network_server/cns.py

Issue 10825051: Update CNS to run on chromeperf34 and CNS tests to run on windows perf_av bot. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: +OWNERS file Created 8 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/test/functional/media/media_seek_perf.py ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/tools/constrained_network_server/cns.py
diff --git a/media/tools/constrained_network_server/cns.py b/media/tools/constrained_network_server/cns.py
index cf2257f60b5a824b267eefdfb7ec00d4bf67b0a1..4fe31ee0722c406ed1914e58930de453cb0d7955 100755
--- a/media/tools/constrained_network_server/cns.py
+++ b/media/tools/constrained_network_server/cns.py
@@ -13,6 +13,7 @@ TODO(dalecurtis): Add some more docs here.
"""
import logging
+from logging import handlers
import mimetypes
import optparse
import os
@@ -321,22 +322,22 @@ def ParseArgs():
# Convert the path to an absolute to remove any . or ..
options.www_root = os.path.abspath(options.www_root)
- # Required so that cherrypy logs do not get propagated to root logger causing
- # the logs to be printed twice.
- cherrypy.log.error_log.propagate = False
- cherrypy.log.access_log.propagate = False
-
_SetLogger(options.verbose)
return options
def _SetLogger(verbose):
- # Logging is used for traffic_control debug statements.
+ file_handler = handlers.RotatingFileHandler('cns.log', 'a', 10000000, 10)
+ file_handler.setFormatter(logging.Formatter('[%(threadName)s] %(message)s'))
+
log_level = _DEFAULT_LOG_LEVEL
if verbose:
log_level = logging.DEBUG
- logging.basicConfig(level=log_level, format='[%(threadName)s] %(message)s')
+ file_handler.setLevel(log_level)
+
+ cherrypy.log.error_log.addHandler(file_handler)
+ cherrypy.log.access_log.addHandler(file_handler)
def Main():
« no previous file with comments | « chrome/test/functional/media/media_seek_perf.py ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698