From c792e34c431c66975b3ca2d1a698b63630b4f420 Mon Sep 17 00:00:00 2001 From: echel0n Date: Wed, 18 Jun 2014 13:41:20 -0700 Subject: [PATCH] FreeNAS test fix #4 --- SickBeard.py | 12 +++--------- sickbeard/webserveInit.py | 2 +- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/SickBeard.py b/SickBeard.py index bd9f3121..e3db0fa0 100755 --- a/SickBeard.py +++ b/SickBeard.py @@ -75,7 +75,7 @@ signal.signal(signal.SIGINT, sickbeard.sig_handler) signal.signal(signal.SIGTERM, sickbeard.sig_handler) throwaway = datetime.datetime.strptime('20110101', '%Y%m%d') - +io_loop = IOLoop.current() def loadShowsFromDB(): """ @@ -362,9 +362,6 @@ def main(): if forceUpdate or sickbeard.UPDATE_SHOWS_ON_START: sickbeard.showUpdateScheduler.action.run(force=True) # @UndefinedVariable - # get ioloop - io_loop = IOLoop.current() - # init startup tasks io_loop.add_timeout(datetime.timedelta(seconds=5), startup) @@ -379,12 +376,9 @@ def main(): # Use this PID for everything sickbeard.PID = os.getpid() - # start IOLoop. - io_loop.start() - sickbeard.saveAndShutdown() - return - if __name__ == "__main__": if sys.hexversion >= 0x020600F0: freeze_support() main() + io_loop.start() + sickbeard.saveAndShutdown() \ No newline at end of file diff --git a/sickbeard/webserveInit.py b/sickbeard/webserveInit.py index 5e2326f5..0424aa6e 100644 --- a/sickbeard/webserveInit.py +++ b/sickbeard/webserveInit.py @@ -65,7 +65,7 @@ def initWebServer(options={}): # Load the app app = Application([], - debug=sickbeard.DEBUG, + debug=False, gzip=True, xheaders=sickbeard.HANDLE_REVERSE_PROXY, cookie_secret='61oETzKXQAGaYdkL5gEmGeJJFuYh7EQnp2XdTP1o/Vo='