monkee.ch/SickGear
1
0
Fork 0
mirror of https://github.com/SickGear/SickGear.git synced 2025-01-07 02:23:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix multiple issues relating to the startup process

Browse source 
Fix multiple instances of SG being able to start
Fix garbled text appearing during startup in console
Fix startup code order and general re-factoring (adapted from midgetspy/Sick-Beard)
This commit is contained in:
adam 2014-12-08 20:17:45 +08:00
parent 866917c432
commit f338c2d65d
2 changed files with 38 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
CHANGES.md
View file

@ -11,6 +11,9 @@
* Change Config/Notifications/Plex logo and description (adapted port from mmccurdy07/Sick-Beard) * Change Config/Notifications/Plex logo and description (adapted port from mmccurdy07/Sick-Beard)
* Add ability for CSS/JS to target a specific page and layout * Add ability for CSS/JS to target a specific page and layout
* Remove legacy sickbeard updater and build automation code * Remove legacy sickbeard updater and build automation code
* Fix multiple instances of SG being able to start
* Fix garbled text appearing during startup in console
* Fix startup code order and general re-factoring (adapted from midgetspy/Sick-Beard)
[develop changelog] [develop changelog]
* Add TVRage network name standardization * Add TVRage network name standardization

67
SickBeard.py
View file

@ -25,6 +25,7 @@ import signal
import sys import sys
import shutil import shutil
import subprocess import subprocess
import socket
if sys.version_info < (2, 6): if sys.version_info < (2, 6):
print "Sorry, requires Python 2.6 or 2.7." print "Sorry, requires Python 2.6 or 2.7."
@ -226,13 +227,13 @@ class SickGear(object):
if self.runAsDaemon: if self.runAsDaemon:
pid_dir = os.path.dirname(self.PIDFILE) pid_dir = os.path.dirname(self.PIDFILE)
if not os.access(pid_dir, os.F_OK): if not os.access(pid_dir, os.F_OK):
sys.exit("PID dir: " + pid_dir + " doesn't exist. Exiting.") sys.exit(u"PID dir: %s doesn't exist. Exiting." % pid_dir)
if not os.access(pid_dir, os.W_OK): if not os.access(pid_dir, os.W_OK):
sys.exit("PID dir: " + pid_dir + " must be writable (write permissions). Exiting.") sys.exit(u'PID dir: %s must be writable (write permissions). Exiting.' % pid_dir)
else: else:
if self.consoleLogging: if self.consoleLogging:
sys.stdout.write("Not running in daemon mode. PID file creation disabled.\n") print u'Not running in daemon mode. PID file creation disabled'
self.CREATEPID = False self.CREATEPID = False
@ -244,34 +245,28 @@ class SickGear(object):
if not os.access(sickbeard.DATA_DIR, os.F_OK): if not os.access(sickbeard.DATA_DIR, os.F_OK):
try: try:
os.makedirs(sickbeard.DATA_DIR, 0744) os.makedirs(sickbeard.DATA_DIR, 0744)
except os.error, e: except os.error:
raise SystemExit("Unable to create datadir '" + sickbeard.DATA_DIR + "'") sys.exit(u'Unable to create data directory: %s + Exiting.' % sickbeard.DATA_DIR)
# Make sure we can write to the data dir # Make sure we can write to the data dir
if not os.access(sickbeard.DATA_DIR, os.W_OK): if not os.access(sickbeard.DATA_DIR, os.W_OK):
raise SystemExit("Datadir must be writeable '" + sickbeard.DATA_DIR + "'") sys.exit(u'Data directory: %s must be writable (write permissions). Exiting.' % sickbeard.DATA_DIR)
# Make sure we can write to the config file # Make sure we can write to the config file
if not os.access(sickbeard.CONFIG_FILE, os.W_OK): if not os.access(sickbeard.CONFIG_FILE, os.W_OK):
if os.path.isfile(sickbeard.CONFIG_FILE): if os.path.isfile(sickbeard.CONFIG_FILE):
raise SystemExit("Config file '" + sickbeard.CONFIG_FILE + "' must be writeable.") sys.exit(u'Config file: %s must be writeable (write permissions). Exiting.' % sickbeard.CONFIG_FILE)
elif not os.access(os.path.dirname(sickbeard.CONFIG_FILE), os.W_OK): elif not os.access(os.path.dirname(sickbeard.CONFIG_FILE), os.W_OK):
raise SystemExit( sys.exit(u'Config file directory: %s must be writeable (write permissions). Exiting'
"Config file root dir '" + os.path.dirname(sickbeard.CONFIG_FILE) + "' must be writeable.") % os.path.dirname(sickbeard.CONFIG_FILE))
# Check if we need to perform a restore first
restoreDir = os.path.join(sickbeard.DATA_DIR, 'restore')
if os.path.exists(restoreDir):
if self.restore(restoreDir, sickbeard.DATA_DIR):
logger.log(u"Restore successful...")
else:
logger.log(u"Restore FAILED!", logger.ERROR)
os.chdir(sickbeard.DATA_DIR) os.chdir(sickbeard.DATA_DIR)
if self.consoleLogging:
print u'Starting up SickGear from %s' % sickbeard.CONFIG_FILE
# Load the config and publish it to the sickbeard package # Load the config and publish it to the sickbeard package
if not os.path.isfile(sickbeard.CONFIG_FILE): if not os.path.isfile(sickbeard.CONFIG_FILE):
logger.log(u"Unable to find '" + sickbeard.CONFIG_FILE + "' , all settings will be default!", logger.ERROR) print u'Unable to find "%s", all settings will be default!' % sickbeard.CONFIG_FILE
sickbeard.CFG = ConfigObj(sickbeard.CONFIG_FILE) sickbeard.CFG = ConfigObj(sickbeard.CONFIG_FILE)
@ -279,15 +274,13 @@ class SickGear(object):
if CUR_DB_VERSION > 0: if CUR_DB_VERSION > 0:
if CUR_DB_VERSION < MIN_DB_VERSION: if CUR_DB_VERSION < MIN_DB_VERSION:
raise SystemExit("Your database version (" + str( print u'Your database version (%s) is too old to migrate from with this version of SickGear' \
CUR_DB_VERSION) + ") is too old to migrate from with this version of SickGear (" + str( % CUR_DB_VERSION
MIN_DB_VERSION) + ").\n" + \ sys.exit(u'Upgrade using a previous version of SG first, or start with no database file to begin fresh')
"Upgrade using a previous version of SB first, or start with no database file to begin fresh.")
if CUR_DB_VERSION > MAX_DB_VERSION: if CUR_DB_VERSION > MAX_DB_VERSION:
raise SystemExit("Your database version (" + str( print u'Your database version (%s) has been incremented past what this version of SickGear supports' \
CUR_DB_VERSION) + ") has been incremented past what this version of SickGear supports (" + str( % CUR_DB_VERSION
MAX_DB_VERSION) + ").\n" + \ sys.exit(u'If you have used other forks of SB, your database may be unusable due to their modifications')
"If you have used other forks of SB, your database may be unusable due to their modifications.")
# Initialize the config and our threads # Initialize the config and our threads
sickbeard.initialize(consoleLogging=self.consoleLogging) sickbeard.initialize(consoleLogging=self.consoleLogging)
@ -298,9 +291,6 @@ class SickGear(object):
# Get PID # Get PID
sickbeard.PID = os.getpid() sickbeard.PID = os.getpid()
# Build from the DB to start with
self.loadShowsFromDB()
if self.forcedPort: if self.forcedPort:
logger.log(u"Forcing web server to port " + str(self.forcedPort)) logger.log(u"Forcing web server to port " + str(self.forcedPort))
self.startPort = self.forcedPort self.startPort = self.forcedPort
@ -339,6 +329,11 @@ class SickGear(object):
# start web server # start web server
try: try:
# used to check if existing SG instances have been started
s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
s.bind((self.web_options['host'], self.web_options['port']))
s.close()
self.webserver = WebServer(self.web_options) self.webserver = WebServer(self.web_options)
self.webserver.start() self.webserver.start()
except IOError: except IOError:
@ -349,8 +344,16 @@ class SickGear(object):
sickbeard.launchBrowser(self.startPort) sickbeard.launchBrowser(self.startPort)
os._exit(1) os._exit(1)
if self.consoleLogging: # Check if we need to perform a restore first
print "Starting up SickGear " + sickbeard.BRANCH + " from " + sickbeard.CONFIG_FILE restoreDir = os.path.join(sickbeard.DATA_DIR, 'restore')
if os.path.exists(restoreDir):
if self.restore(restoreDir, sickbeard.DATA_DIR):
logger.log(u"Restore successful...")
else:
logger.log_error_and_exit(u"Restore FAILED!", logger.ERROR)
# Build from the DB to start with
self.loadShowsFromDB()
# Fire up all our threads # Fire up all our threads
sickbeard.start() sickbeard.start()