Rev668, Stop if UiServer bind failed to avoid double start

This commit is contained in:
HelloZeroNet 2015-12-28 00:19:58 +01:00
parent 35b0019be2
commit c9578e9037
2 changed files with 7 additions and 2 deletions

View File

@ -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()

View File

@ -2,6 +2,7 @@ import logging
import time
import cgi
import socket
import sys
from gevent.pywsgi import WSGIServer
from gevent.pywsgi import WSGIHandler
@ -119,7 +120,11 @@ class UiServer:
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):