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

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

Issue 10389179: Add file name and URL params as key for CNS ports. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Created 8 years, 7 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 | « no previous file | 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 c206c9cad3e51d4f3a310d1c373e193e9fda75d2..b808be3bc3255ffe0829cadafc9bb68bc10e10d4 100755
--- a/media/tools/constrained_network_server/cns.py
+++ b/media/tools/constrained_network_server/cns.py
@@ -201,8 +201,6 @@ class ConstrainedNetworkServer(object):
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'
@@ -243,7 +241,7 @@ class ConstrainedNetworkServer(object):
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:
@@ -333,6 +331,7 @@ def ParseArgs():
# 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)
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698