From 5372ebb8be5a5e6669129b6dc78fa6f333b6e186 Mon Sep 17 00:00:00 2001
From: Camil Staps
Date: Fri, 4 Mar 2016 23:09:53 +0100
Subject: Project 1: Config system; ETags; error pages

---
 project1/proj1_s4498062/webserver.py | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

(limited to 'project1/proj1_s4498062/webserver.py')

diff --git a/project1/proj1_s4498062/webserver.py b/project1/proj1_s4498062/webserver.py
index a361d5b..c01df4e 100644
--- a/project1/proj1_s4498062/webserver.py
+++ b/project1/proj1_s4498062/webserver.py
@@ -13,20 +13,23 @@ if __name__ == '__main__':
     parser = argparse.ArgumentParser(description="HTTP Server")
     parser.add_argument('-c', '--config', type=str, default='~/.webpy.ini',
             help='configuration file')
-    parser.add_argument('-a', '--address', type=str, default='localhost',
+    
+    parser.add_argument('-a', '--address', type=str, default=None,
             help='address to listen on (default localhost)')
-    parser.add_argument('-p', '--port', type=int, default=80,
-            help='port to listen on (default 80)')
-    parser.add_argument('-t', '--timeout', type=int, default=15,
-            help='timeout for incoming connections (default 15)')
+    parser.add_argument('-p', '--port', type=int, default=None,
+            help='port to listen on (no default)')
+    parser.add_argument('-t', '--timeout', type=int, default=None,
+            help='timeout for incoming connections (no default)')
+
     parser.add_argument('-l', '--log', type=str, default='info',
             help='log level (debug, info, warning, error, critical)')
     parser.add_argument('-lf', '--log-file', type=str, default=None,
             help='log file (default stdout)')
+    
     args = parser.parse_args()
 
     # Logging
-    fmt = '[%(asctime)s] %(process)d %(levelname)s %(message)s'
+    fmt = '[%(asctime)s] %(levelname)s %(message)s'
     logging.basicConfig(format=fmt, level=getattr(logging, args.log.upper()))
     if args.log_file != None:
         logger = logging.getLogger(webhttp.weblogging.name)
@@ -36,8 +39,8 @@ if __name__ == '__main__':
 
     # Start server
     config = os.path.expanduser(os.path.expandvars(args.config))
-    server = webhttp.server.Server(config=config, 
-            address=args.address, port=args.port, timeout=args.timeout)
+    server = webhttp.server.Server(configfile=config,
+            hostname=args.address, port=args.port, timeout=args.timeout)
     try:
         server.run()
     except KeyboardInterrupt:
-- 
cgit v1.2.3