Add file name and URL params as key for CNS ports.

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.
 
@@ skipping 183 matching lines @@
 
     Args:
       f: path relative to http root of file to serve.
       bandwidth: maximum allowed bandwidth for the provided port (integer
           in kbit/s).
       latency: time to add to each packet (integer in ms).
       loss: percentage of packets to drop (integer, 0-100).
       new_port: whether to use a new port for this request or not.
       no_cache: Set reponse's cache-control to no-cache.
     """
-    cherrypy.log('Got request string: %s' % cherrypy.request.request_line)
-
     if no_cache:
       response = cherrypy.response
       response.headers['Pragma'] = 'no-cache'
       response.headers['Cache-Control'] = 'no-cache'
 
     # CherryPy is a bit wonky at detecting parameters, so just make them all
     # optional and validate them ourselves.
     if not f:
       raise cherrypy.HTTPError(400, 'Invalid request. File must be specified.')
 
@@ skipping 20 matching lines @@
 
     # Allocate a port using the given constraints. If a port with the requested
     # key is already allocated, it will be reused.
     #
     # TODO(dalecurtis): The key cherrypy.request.remote.ip might not be unique
     # if build slaves are sharing the same VM.
     start_time = time.time()
     constrained_port = self._port_allocator.Get(
         cherrypy.request.remote.ip, server_port=self._options.port,
         interface=self._options.interface, bandwidth=bandwidth, latency=latency,
-        loss=loss, new_port=new_port)
+        loss=loss, new_port=new_port, file=f, **kwargs)
     end_time = time.time()
 
     if not constrained_port:
       raise cherrypy.HTTPError(503, 'Service unavailable. Out of ports.')
 
     cherrypy.log('Time to set up port %d = %ssec.' %
                  (constrained_port, end_time - start_time))
 
     # Build constrained URL using the constrained port and original URL
     # parameters except the network constraints (bandwidth, latency, and loss).
@@ skipping 69 matching lines @@
 
   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.
   log_level = _DEFAULT_LOG_LEVEL
   if verbose:
@@ skipping 24 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(options.interface, all_ports=True)
 
 
 if __name__ == '__main__':
   Main()