Rev668, Stop if UiServer bind failed to avoid double start

neoyoung · Dec 27, 2015 · c9578e9 · c9578e9
1 parent 35b0019
commit c9578e9
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/src/Config.py b/src/Config.py
@@ -8,7 +8,7 @@ class Config(object):
 
     def __init__(self, argv):
         self.version = "0.3.4"
-        self.rev = 667
+        self.rev = 668
         self.argv = argv
         self.action = None
         self.createParser()

diff --git a/src/Ui/UiServer.py b/src/Ui/UiServer.py
@@ -2,6 +2,7 @@
 import time
 import cgi
 import socket
+import sys
 
 from gevent.pywsgi import WSGIServer
 from gevent.pywsgi import WSGIHandler
@@ -119,7 +120,11 @@ def start(self):
 
         self.server = WSGIServer((self.ip.replace("*", ""), self.port), handler, handler_class=UiWSGIHandler, log=self.log)
         self.server.sockets = {}
-        self.server.serve_forever()
+        try:
+            self.server.serve_forever()
+        except Exception, err:
+            self.log.error("Web interface bind error, must be running already, exiting.... %s" % err)
+            sys.modules["main"].file_server.stop()
         self.log.debug("Stopped.")
 
     def stop(self):