Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Delta Between Two Patch Sets: cms/bin/test_server.py

Issue 29327611: Issue 3056 - [cms] Enable threading for the test server (Closed)
Left Patch Set: Use daemon threads Created Sept. 15, 2015, 3:22 p.m.
Right Patch Set: Referred GitHub issue Created Sept. 15, 2015, 3:24 p.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
Left: Side by side diff | Download
Right: Side by side diff | Download
« no previous file with change/comment | « no previous file | no next file » | no next file with change/comment »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
LEFTRIGHT
1 # coding: utf-8 1 # coding: utf-8
2 2
3 # This file is part of the Adblock Plus web scripts, 3 # This file is part of the Adblock Plus web scripts,
4 # Copyright (C) 2006-2015 Eyeo GmbH 4 # Copyright (C) 2006-2015 Eyeo GmbH
5 # 5 #
6 # Adblock Plus is free software: you can redistribute it and/or modify 6 # Adblock Plus is free software: you can redistribute it and/or modify
7 # it under the terms of the GNU General Public License version 3 as 7 # it under the terms of the GNU General Public License version 3 as
8 # published by the Free Software Foundation. 8 # published by the Free Software Foundation.
9 # 9 #
10 # Adblock Plus is distributed in the hope that it will be useful, 10 # Adblock Plus is distributed in the hope that it will be useful,
(...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after
118 if len(sys.argv) < 2: 118 if len(sys.argv) < 2:
119 source = FileSource(os.curdir) 119 source = FileSource(os.curdir)
120 elif os.path.isdir(sys.argv[1]): 120 elif os.path.isdir(sys.argv[1]):
121 source = FileSource(sys.argv[1]) 121 source = FileSource(sys.argv[1])
122 else: 122 else:
123 sys.exit("Usage: %s [source_dir]" % sys.argv[0]) 123 sys.exit("Usage: %s [source_dir]" % sys.argv[0])
124 124
125 try: 125 try:
126 from werkzeug.serving import ThreadedWSGIServer, run_simple 126 from werkzeug.serving import ThreadedWSGIServer, run_simple
127 127
128 # see https://github.com/mitsuhiko/werkzeug/pull/770
128 ThreadedWSGIServer.daemon_threads = True 129 ThreadedWSGIServer.daemon_threads = True
129 130
130 def run(*args, **kwargs): 131 def run(*args, **kwargs):
131 # The werkzeug logger must be configured before the 132 # The werkzeug logger must be configured before the
132 # root logger. Also we must prevent it from propagating 133 # root logger. Also we must prevent it from propagating
133 # messages, otherwise messages are logged twice. 134 # messages, otherwise messages are logged twice.
134 import logging 135 import logging
135 logger = logging.getLogger("werkzeug") 136 logger = logging.getLogger("werkzeug")
136 logger.propagate = False 137 logger.propagate = False
137 logger.setLevel(logging.INFO) 138 logger.setLevel(logging.INFO)
(...skipping 13 matching lines...) Expand all
151 return app(environ, start_response) 152 return app(environ, start_response)
152 except Exception, e: 153 except Exception, e:
153 return show_error(start_response, "500 Internal Server Error", 154 return show_error(start_response, "500 Internal Server Error",
154 uri=environ.get("PATH_INFO"), error=e) 155 uri=environ.get("PATH_INFO"), error=e)
155 156
156 server = make_server(host, port, wrapper, ThreadedWSGIServer) 157 server = make_server(host, port, wrapper, ThreadedWSGIServer)
157 print " * Running on http://%s:%i/" % server.server_address 158 print " * Running on http://%s:%i/" % server.server_address
158 server.serve_forever() 159 server.serve_forever()
159 160
160 run("localhost", 5000, handler, use_reloader=True, use_debugger=True) 161 run("localhost", 5000, handler, use_reloader=True, use_debugger=True)
LEFTRIGHT
« no previous file | no next file » | Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Toggle Comments ('s')

Powered by Google App Engine
This is Rietveld