Private GIT

Skip to content
Snippets Groups Projects
Commit 7e8761ad authored by Dustyn Gibson's avatar Dustyn Gibson
Browse files

Fix SR not auto exiting if another instance is running

parent 0dbccc39
No related branches found
No related tags found
No related merge requests found
......@@ -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)
if self.consoleLogging:
print "Starting up SickRage " + sickbeard.BRANCH + " from " + sickbeard.CONFIG_FILE
......
......@@ -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()
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment