Work as standalone server or as thread.

Previous thread work broke the standalone server, this fixes it.

1 files changed, 7 insertions, 5 deletions

diff --git a/server.py b/server.py
index ce1f14d..51e7164 100755
--- a/server.py
+++ b/server.py
@@ -594,11 +594,13 @@ def run_server(path, port):
     httpd = BaseHTTPServer.HTTPServer(('', port),
         lambda *args: WikiRequestHandler(index, *args))
 
-    from threading import Thread
-    server = Thread(target=httpd.serve_forever)
-    server.setDaemon(True)
-    server.start()
-    #httpd.serve_forever()
+    if __name__ == '__main__':
+        httpd.serve_forever()
+    else:
+        from threading import Thread
+        server = Thread(target=httpd.serve_forever)
+        server.setDaemon(True)
+        server.start()
     
     # Tell the world that we're ready to accept request.
     print 'ready'