diff options
| author | shadi@chromium.org <shadi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-02 20:54:48 +0000 |
|---|---|---|
| committer | shadi@chromium.org <shadi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-02 20:54:48 +0000 |
| commit | 0500f7c19ae8407cfd5d9da3adeaa8bada15ca34 (patch) | |
| tree | 35b34c170258b94b204859044e37fb04d30d51e9 /media/tools | |
| parent | d0ae86126a5a9df3068f38edd30ac22bb0a9f477 (diff) | |
| download | chromium_src-0500f7c19ae8407cfd5d9da3adeaa8bada15ca34.zip chromium_src-0500f7c19ae8407cfd5d9da3adeaa8bada15ca34.tar.gz chromium_src-0500f7c19ae8407cfd5d9da3adeaa8bada15ca34.tar.bz2 | |
Update CNS to run on chromeperf34 and CNS tests to run on windows perf_av bot.
(Added OWNERS file to chrome/test/functional/media)
BUG=139262
NOTRY=true
TEST=none
Review URL: https://chromiumcodereview.appspot.com/10825051
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@149695 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/tools')
| -rwxr-xr-x | media/tools/constrained_network_server/cns.py | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/media/tools/constrained_network_server/cns.py b/media/tools/constrained_network_server/cns.py index cf2257f..4fe31ee 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(): |