diff --git a/SickBeard.py b/SickBeard.py
index ad2fb4ca..aa0a4c6b 100755
--- a/SickBeard.py
+++ b/SickBeard.py
@@ -60,6 +60,7 @@ from sickbeard import db
 from sickbeard.tv import TVShow
 from sickbeard import logger
 from sickbeard import webserveInit
+from sickbeard import autoreload_shutdown
 from sickbeard.version import SICKBEARD_VERSION
 from sickbeard.databases.mainDB import MIN_DB_VERSION
 from sickbeard.databases.mainDB import MAX_DB_VERSION
@@ -390,7 +391,7 @@ def main():
     # autoreload.
     if sickbeard.AUTO_UPDATE:
         tornado.autoreload.start(io_loop)
-        tornado.autoreload.add_reload_hook(sickbeard.autoreload_shutdown)
+        tornado.autoreload.add_reload_hook(autoreload_shutdown)
 
     # start IOLoop.
     io_loop.start()
diff --git a/sickbeard/logger.py b/sickbeard/logger.py
index 987cfe8d..368dbf30 100644
--- a/sickbeard/logger.py
+++ b/sickbeard/logger.py
@@ -71,10 +71,12 @@ class SBRotatingLogHandler(object):
             sb_logger = logging.getLogger('sickbeard')
             sub_logger = logging.getLogger('subliminal')
             imdb_logger = logging.getLogger('imdbpy')
+            tornado_logger = logging.getLogger('tornado')
 
             sb_logger.removeHandler(handler)
             sub_logger.removeHandler(handler)
             imdb_logger.removeHandler(handler)
+            tornado_logger.removeHandler(handler)
 
             handler.flush()
             handler.close()
@@ -108,12 +110,16 @@ class SBRotatingLogHandler(object):
                     {'sickbeard': logging.Formatter('%(asctime)s %(levelname)s::%(message)s', '%H:%M:%S'),
                      'subliminal': logging.Formatter('%(asctime)s %(levelname)s::SUBLIMINAL :: %(message)s',
                                                      '%H:%M:%S'),
-                     'imdbpy': logging.Formatter('%(asctime)s %(levelname)s::IMDBPY :: %(message)s', '%H:%M:%S')
+                     'imdbpy': logging.Formatter('%(asctime)s %(levelname)s::IMDBPY :: %(message)s', '%H:%M:%S'),
+                     'tornado.general': logging.Formatter('%(asctime)s %(levelname)s::TORNADO :: %(message)s', '%H:%M:%S'),
+                     'tornado.application': logging.Formatter('%(asctime)s %(levelname)s::TORNADO :: %(message)s', '%H:%M:%S')
                     },
                     logging.Formatter('%(message)s'), ))
 
                 # add the handler to the root logger
                 logging.getLogger('sickbeard').addHandler(console)
+                logging.getLogger('tornado.general').addHandler(console)
+                logging.getLogger('tornado.application').addHandler(console)
                 logging.getLogger('subliminal').addHandler(console)
                 logging.getLogger('imdbpy').addHandler(console)
 
@@ -121,12 +127,24 @@ class SBRotatingLogHandler(object):
 
         self.cur_handler = self._config_handler()
         logging.getLogger('sickbeard').addHandler(self.cur_handler)
+        logging.getLogger('tornado.general').addHandler(self.cur_handler)
+        logging.getLogger('tornado.application').addHandler(self.cur_handler)
         logging.getLogger('subliminal').addHandler(self.cur_handler)
         logging.getLogger('imdbpy').addHandler(self.cur_handler)
 
         logging.getLogger('sickbeard').setLevel(DB)
-        logging.getLogger('subliminal').setLevel(logging.WARNING)
-        logging.getLogger('imdbpy').setLevel(logging.WARNING)
+
+        log_level = logging.WARNING
+        if sickbeard.DEBUG:
+            log_level = logging.DEBUG
+
+        logging.getLogger('tornado.general').setLevel(log_level)
+        logging.getLogger('tornado.application').setLevel(log_level)
+        logging.getLogger('subliminal').setLevel(log_level)
+        logging.getLogger('imdbpy').setLevel(log_level)
+
+        # send logging to null
+        logging.getLogger('tornado.access').addHandler(logging.NullHandler())
 
         # already logging in new log folder, close the old handler
         if old_handler:
@@ -151,7 +169,9 @@ class SBRotatingLogHandler(object):
             {'sickbeard': logging.Formatter('%(asctime)s %(levelname)-8s %(message)s', '%Y-%m-%d %H:%M:%S'),
              'subliminal': logging.Formatter('%(asctime)s %(levelname)-8s SUBLIMINAL :: %(message)s',
                                              '%Y-%m-%d %H:%M:%S'),
-             'imdbpy': logging.Formatter('%(asctime)s %(levelname)-8s IMDBPY :: %(message)s', '%Y-%m-%d %H:%M:%S')
+             'imdbpy': logging.Formatter('%(asctime)s %(levelname)-8s IMDBPY :: %(message)s', '%Y-%m-%d %H:%M:%S'),
+             'tornado.general': logging.Formatter('%(asctime)s %(levelname)-8s TORNADO :: %(message)s', '%Y-%m-%d %H:%M:%S'),
+             'tornado.application': logging.Formatter('%(asctime)s %(levelname)-8s TORNADO :: %(message)s', '%Y-%m-%d %H:%M:%S')
             },
             logging.Formatter('%(message)s'), ))
 
@@ -184,6 +204,7 @@ class SBRotatingLogHandler(object):
         sb_logger = logging.getLogger('sickbeard')
         sub_logger = logging.getLogger('subliminal')
         imdb_logger = logging.getLogger('imdbpy')
+        tornado_logger = logging.getLogger('tornado')
 
         # delete the old handler
         if self.cur_handler:
@@ -208,6 +229,7 @@ class SBRotatingLogHandler(object):
         sb_logger.addHandler(new_file_handler)
         sub_logger.addHandler(new_file_handler)
         imdb_logger.addHandler(new_file_handler)
+        tornado_logger.addHandler(new_file_handler)
 
     def log(self, toLog, logLevel=MESSAGE):
 
@@ -231,6 +253,7 @@ class SBRotatingLogHandler(object):
 
             sub_logger = logging.getLogger('subliminal')
             imdb_logger = logging.getLogger('imdbpy')
+            tornado_logger = logging.getLogger('tornado')
 
             try:
                 if logLevel == DEBUG:
diff --git a/sickbeard/webserveInit.py b/sickbeard/webserveInit.py
index 9644953f..1be54a56 100644
--- a/sickbeard/webserveInit.py
+++ b/sickbeard/webserveInit.py
@@ -4,6 +4,7 @@ import sickbeard
 import webserve
 import webapi
 
+import tornado.options
 from sickbeard import logger
 from sickbeard.helpers import create_https_certificates
 from tornado.web import Application, StaticFileHandler, RedirectHandler, HTTPError
@@ -97,8 +98,7 @@ def initWebServer(options={}):
 
     # Load the app
     app = Application([],
-                        log_function=lambda x: None,
-                        debug=False,
+                        debug=sickbeard.DEBUG,
                         gzip=True,
                         autoreload=sickbeard.AUTO_UPDATE,
                         xheaders=True,