Merge remote-tracking branch 'origin/dev'

SickBeard.py

@@ -76,7 +76,6 @@ signal.signal(signal.SIGTERM, sickbeard.sig_handler)
 
 throwaway = datetime.datetime.strptime('20110101', '%Y%m%d')
 
-
 def loadShowsFromDB():
     """
     Populates the showList with shows from the database
@@ -303,6 +302,12 @@ def main():
                 MAX_DB_VERSION) + ").\n" + \
                              "If you have used other forks of SB, your database may be unusable due to their modifications.")
 
+    if sickbeard.DAEMON:
+        daemonize()
+
+    # Use this PID for everything
+    sickbeard.PID = os.getpid()
+
     # Initialize the config and our threads
     sickbeard.initialize(consoleLogging=consoleLogging)
 
@@ -341,7 +346,7 @@ def main():
         'handle_reverse_proxy': sickbeard.HANDLE_REVERSE_PROXY,
         'https_cert': sickbeard.HTTPS_CERT,
         'https_key': sickbeard.HTTPS_KEY,
-    }
+        }
 
     # init tornado
     webserveInit.initWebServer(options)
@@ -362,7 +367,7 @@ def main():
         if forceUpdate or sickbeard.UPDATE_SHOWS_ON_START:
             sickbeard.showUpdateScheduler.action.run(force=True)  # @UndefinedVariable
 
-    # get ioloop
+    # create ioloop
     io_loop = IOLoop.current()
 
     # init startup tasks
@@ -373,18 +378,10 @@ def main():
     if sickbeard.AUTO_UPDATE:
         tornado.autoreload.start(io_loop)
 
-    if sickbeard.DAEMON:
-        daemonize()
-
-    # 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()
+    main()

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='