Merge pull request #14 from cynthia/r/init-error

Make general init failure point users to the FM.
web-platform-tests · Aug 12, 2014 · ec9b10b · ec9b10b
2 parents 50339d5 + c431f7e
commit ec9b10b
Showing 1 changed file with 15 additions and 11 deletions.
diff --git a/wptserve/server.py b/wptserve/server.py
@@ -329,17 +329,21 @@ def __init__(self, host="127.0.0.1", port=8000,
         if use_ssl:
             assert certificate is not None and os.path.exists(certificate)
 
-        self.httpd = server_cls((host, port),
-                                handler_cls,
-                                self.router,
-                                self.rewriter,
-                                config=config,
-                                bind_hostname=bind_hostname,
-                                use_ssl=use_ssl,
-                                certificate=certificate)
-        self.started = False
-
-        _host, self.port = self.httpd.socket.getsockname()
+        try:
+            self.httpd = server_cls((host, port),
+                                    handler_cls,
+                                    self.router,
+                                    self.rewriter,
+                                    config=config,
+                                    bind_hostname=bind_hostname,
+                                    use_ssl=use_ssl,
+                                    certificate=certificate)
+            self.started = False
+
+            _host, self.port = self.httpd.socket.getsockname()
+        except Exception:
+            logger.error('Init failed! You may need to modify your hosts file. Refer to README.md.');
+            raise
 
     def start(self, block=False):
         """Start the server.