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

Unified Diff: cms/bin/test_server.py

Issue 29334114: issue 3546 - Add port and hostname options to CMS testing server (Closed)
Patch Set: Removed listen argument in favor of address and port, updated help text, and updated formatted striā€¦ Created Jan. 21, 2016, 2:40 p.m.
Use n/p to move between diff chunks; N/P to move between comments.
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: cms/bin/test_server.py
===================================================================
--- a/cms/bin/test_server.py
+++ b/cms/bin/test_server.py
@@ -18,6 +18,7 @@
import mimetypes
import os
import sys
+import argparse
import jinja2
@@ -26,6 +27,8 @@
from cms.converters import converters
source = None
+address = None
+port = None
UNICODE_ENCODING = "utf-8"
@@ -65,7 +68,7 @@
for format in converters.iterkeys():
for p in (page, alternative_page):
if source.has_page(p, format):
- return (p, process_page(source, locale, p, format, "http://127.0.0.1:5000"))
+ return (p, process_page(source, locale, p, format, "http://%s:%d" % (address, port)))
if source.has_localizable_file(locale, page):
return (page, source.read_localizable_file(locale, page))
@@ -99,6 +102,7 @@
yield fragment.encode(UNICODE_ENCODING)
def handler(environ, start_response):
+
path = environ.get("PATH_INFO")
data = get_data(path)
@@ -115,12 +119,16 @@
return [data]
if __name__ == "__main__":
- if len(sys.argv) < 2:
- source = FileSource(os.curdir)
- elif os.path.isdir(sys.argv[1]):
- source = FileSource(sys.argv[1])
- else:
- sys.exit("Usage: %s [source_dir]" % sys.argv[0])
+
+ parser = argparse.ArgumentParser(description='CMS testing server.')
Sebastian Noack 2016/01/21 15:12:32 Nit: As below, no full stop if it isn't a sentence
juliandoucette 2016/01/21 16:06:25 Done.
+ parser.add_argument('path', nargs='?', default=os.curdir)
+ parser.add_argument('-a', '--address', default='localhost', help='Address of the interface the server will listen on')
Sebastian Noack 2016/01/21 15:12:32 Nit: Mind making the help messages consistent? Eit
juliandoucette 2016/01/21 16:06:26 Done.
juliandoucette 2016/01/21 16:06:26 Done.
+ parser.add_argument('-p', '--port', type=int, default=5000, help='The TCP port the server will listen on')
+ args = parser.parse_args()
+
+ source = FileSource(args.path)
+ address = args.address
+ port = args.port
try:
from werkzeug.serving import ThreadedWSGIServer, run_simple
@@ -158,4 +166,4 @@
print " * Running on http://%s:%i/" % server.server_address
server.serve_forever()
- run("localhost", 5000, handler, use_reloader=True, use_debugger=True)
+ run(address, port, handler, use_reloader=True, use_debugger=True)
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld