From 7e8761adbfec872319b925e8353cb67ff187bb94 Mon Sep 17 00:00:00 2001 From: Dustyn Gibson <miigotu@gmail.com> Date: Tue, 14 Jul 2015 02:34:19 -0700 Subject: [PATCH] Fix SR not auto exiting if another instance is running --- SickBeard.py | 12 ++---------- sickbeard/webserveInit.py | 10 +++++----- 2 files changed, 7 insertions(+), 15 deletions(-) diff --git a/SickBeard.py b/SickBeard.py index 75c5277ef..3978e72fb 100755 --- a/SickBeard.py +++ b/SickBeard.py @@ -359,16 +359,8 @@ class SickRage(object): } # start web server - try: - self.webserver = SRWebServer(self.web_options) - self.webserver.start() - except IOError: - logger.log(u"Unable to start web server, is something else running on port %d?" % self.startPort, - logger.ERROR) - if sickbeard.LAUNCH_BROWSER and not self.runAsDaemon: - logger.log(u"Launching browser and exiting", logger.ERROR) - sickbeard.launchBrowser('https' if sickbeard.ENABLE_HTTPS else 'http', self.startPort, sickbeard.WEB_ROOT) - os._exit(1) + self.webserver = SRWebServer(self.web_options) + self.webserver.start() if self.consoleLogging: print "Starting up SickRage " + sickbeard.BRANCH + " from " + sickbeard.CONFIG_FILE diff --git a/sickbeard/webserveInit.py b/sickbeard/webserveInit.py index 8f2bd31e7..2c44c9fd5 100644 --- a/sickbeard/webserveInit.py +++ b/sickbeard/webserveInit.py @@ -138,11 +138,11 @@ class SRWebServer(threading.Thread): try: self.server.listen(self.options['port'], self.options['host']) except: - etype, evalue, etb = sys.exc_info() - logger.log( - "Could not start webserver on %s. Excpeption: %s, Error: %s" % (self.options['port'], etype, evalue), - logger.ERROR) - return + if sickbeard.LAUNCH_BROWSER and not self.daemon: + sickbeard.launchBrowser('https' if sickbeard.ENABLE_HTTPS else 'http', self.options['port'], sickbeard.WEB_ROOT) + logger.log(u"Launching browser and exiting") + logger.log(u"Could not start webserver on port %s, already in use!" % self.options['port']) + os._exit(1) try: self.io_loop.start() -- GitLab