Revert "Allow doc_root and ws_doc_root to be passed in as config opti…

…ons."

This reverts commit 13647f6.

serve.py

@@ -65,14 +65,14 @@ def __init__(self):
         self.daemon = None
         self.stop = Event()
 
-    def start(self, init_func, config, paths, port):
-        self.proc = Process(target=self.create_daemon, args=(init_func, config, paths, port))
+    def start(self, init_func, config, port):
+        self.proc = Process(target=self.create_daemon, args=(init_func, config, port))
         self.proc.daemon = True
         self.proc.start()
 
-    def create_daemon(self, init_func, config, paths, port):
+    def create_daemon(self, init_func, config, port):
         try:
-            self.daemon = init_func(config, paths, port)
+            self.daemon = init_func(config, port)
         except socket.error:
             logger.error("Socket error on port %s" % port)
             raise
@@ -93,10 +93,10 @@ def kill(self):
         self.proc.terminate()
         self.proc.join()
 
-def check_subdomains(config, paths, subdomains):
+def check_subdomains(config, subdomains):
     port = get_port()
     wrapper = ServerProc()
-    wrapper.start(start_http_server, config, paths, port)
+    wrapper.start(start_http_server, config, port)
 
     rv = {}
 
@@ -125,7 +125,7 @@ def get_subdomains(config):
     return {subdomain: (subdomain.encode("idna"), host)
             for subdomain in subdomains}
 
-def start_servers(config, paths, ports):
+def start_servers(config, ports):
     servers = defaultdict(list)
 
     host = config["host"]
@@ -140,24 +140,24 @@ def start_servers(config, paths, ports):
                          "wss":start_wss_server}[scheme]
 
             server_proc = ServerProc()
-            server_proc.start(init_func, config, paths, port)
+            server_proc.start(init_func, config, port)
 
             logger.info("Started server at %s://%s:%s" % (scheme, config["host"], port))
             servers[scheme].append((port, server_proc))
 
     return servers
 
-def start_http_server(config, paths, port):
+def start_http_server(config, port):
     return wptserve.WebTestHttpd(host=config["host"],
                                  port=port,
-                                 doc_root=paths["doc_root"],
+                                 doc_root=repo_root,
                                  routes=routes,
                                  rewrites=rewrites,
                                  config=config,
                                  use_ssl=False,
                                  certificate=None)
 
-def start_https_server(config, paths, port):
+def start_https_server(config, port):
     return
 
 class WebSocketDaemon(object):
@@ -205,14 +205,14 @@ def stop(self):
             self.started = False
         self.server = None
 
-def start_ws_server(config, paths, port):
+def start_ws_server(config, port):
     return WebSocketDaemon(config["host"],
                            str(port),
                            repo_root,
-                           paths["ws_doc_root"],
+                           os.path.join(repo_root, "websockets", "handlers"),
                            "debug")
 
-def start_wss_server(config, paths, port):
+def start_wss_server(config, port):
     return
 
 def get_ports(config):
@@ -241,16 +241,12 @@ def normalise_config(config, domains, ports):
 def start(config):
     ports = get_ports(config)
     domains = get_subdomains(config)
-
-    paths = {"doc_root": config["doc_root"],
-             "ws_doc_root": config["ws_doc_root"]}
-
     if config["check_subdomains"]:
-        domains = check_subdomains(config, paths, domains)
+        domains = check_subdomains(config, domains)
 
     config_ = normalise_config(config, domains, ports)
 
-    servers = start_servers(config_, paths, ports)
+    servers = start_servers(config_, ports)
 
     return config_, servers
 
@@ -260,21 +256,6 @@ def iter_procs(servers):
         for port, server in servers:
             yield server.proc
 
-def value_set(config, key):
-    return key in config and config[key] is not None
-
-def set_computed_defaults(config):
-    if not value_set(config, "ws_doc_root"):
-        if value_set(config, "doc_root"):
-            root = config["doc_root"]
-        else:
-            root = repo_root
-        config["ws_doc_root"] = os.path.join(repo_root, "websockets", "handlers")
-
-    if not value_set(config, "doc_root"):
-        config["doc_root"] = repo_root
-
-
 def merge_json(base_obj, override_obj):
     rv = {}
     for key, value in base_obj.iteritems():
@@ -299,10 +280,7 @@ def load_config(default_path, override_path=None):
             override_obj = json.load(f)
     else:
         override_obj = {}
-    rv = merge_json(base_obj, override_obj)
-
-    set_computed_defaults(rv)
-    return rv
+    return merge_json(base_obj, override_obj)
 
 def main():
     global logger