moparisthebest/SickRage
1
0
Fork 0
mirror of https://github.com/moparisthebest/SickRage synced 2024-12-12 11:02:21 -05:00
Code Issues Releases Wiki Activity

Testing fix for 500 internal server error/TypeError: argument of type 'NoneType' is not iterable

Browse Source
This commit is contained in:
echel0n 2014-06-25 17:12:52 -07:00
parent 20aa4b6331
commit 67ae7af226
1 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
SickBeard.py
View File

@ -311,9 +311,7 @@ def main():
sickbeard.CFG = ConfigObj(sickbeard.CONFIG_FILE) sickbeard.CFG = ConfigObj(sickbeard.CONFIG_FILE)
myDB = db.DBConnection() CUR_DB_VERSION = db.DBConnection().checkDBVersion()
CUR_DB_VERSION = myDB.checkDBVersion()
if CUR_DB_VERSION > 0: if CUR_DB_VERSION > 0:
if CUR_DB_VERSION < MIN_DB_VERSION: if CUR_DB_VERSION < MIN_DB_VERSION:
@ -327,16 +325,20 @@ def main():
MAX_DB_VERSION) + ").\n" + \ MAX_DB_VERSION) + ").\n" + \
"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
sickbeard.initialize(consoleLogging=consoleLogging)
sickbeard.showList = []
if sickbeard.DAEMON: if sickbeard.DAEMON:
daemonize() daemonize()
# Use this PID for everything # Use this PID for everything
sickbeard.PID = os.getpid() sickbeard.PID = os.getpid()
# Initialize the config and our threads # Build from the DB to start with
sickbeard.initialize(consoleLogging=consoleLogging) logger.log(u"Loading initial show list")
loadShowsFromDB()
sickbeard.showList = []
if forcedPort: if forcedPort:
logger.log(u"Forcing web server to port " + str(forcedPort)) logger.log(u"Forcing web server to port " + str(forcedPort))
@ -376,10 +378,6 @@ def main():
# init tornado # init tornado
webserveInit.initWebServer(options) webserveInit.initWebServer(options)
# Build from the DB to start with
logger.log(u"Loading initial show list")
loadShowsFromDB()
def startup(): def startup():
# Fire up all our threads # Fire up all our threads
sickbeard.start() sickbeard.start()