Update CNS to run on chromeperf34 and CNS tests to run on windows perf_av bot.

media/tools/constrained_network_server/cns.py

 #!/usr/bin/env python
 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Constrained Network Server. Serves files with supplied network constraints.
 
 The CNS exposes a web based API allowing network constraints to be imposed on
 file serving.
 
 TODO(dalecurtis): Add some more docs here.
 
 """
 
 import logging
+from logging import handlers

[DaleCurtis, 2012/07/27 00:49:43]

What does gpylint say about the ordering here?

[shadi, 2012/07/27 01:06:25]

I did check gpylint, this is actually its recommended way.

 import mimetypes
 import optparse
 import os
 import signal
 import sys
 import threading
 import time
 import traffic_control
 
 try:
@@ skipping 288 matching lines @@
       options.port_range = [int(port) for port in options.port_range.split(',')]
   except ValueError:
     parser.error('Invalid port range specified.')
 
   if options.expiry_time < 0:
     parser.error('Invalid expiry time specified.')
 
   # 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, 1000)

[DaleCurtis, 2012/07/27 00:49:43]

How will we see the logs on Linux now?

[shadi, 2012/07/27 01:06:25]

It should show as it currently does since locally I get the output on the screen
as well as log files. I would still need to run it on the bot to be 100% sure.

I reduced the total number of log files to 10 instead of 1000 (each up to 10MB).

+  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():
   """Configure and start the ConstrainedNetworkServer."""
   options = ParseArgs()
 
   try:
     traffic_control.CheckRequirements()
   except traffic_control.TrafficControlError as e:
     cherrypy.log(e.msg)
@@ skipping 14 matching lines @@
   try:
     cherrypy.quickstart(ConstrainedNetworkServer(options, pa))
   finally:
     # Disable Ctrl-C handler to prevent interruption of cleanup.
     signal.signal(signal.SIGINT, lambda signal, frame: None)
     pa.Cleanup(all_ports=True)
 
 
 if __name__ == '__main__':
   Main()