Merge pull request #1714 from abeloin/patch-scheduler_try

Scheduler: apply the try on the whole run function

sickbeard/scheduler.py

@@ -51,7 +51,7 @@ class Scheduler(threading.Thread):
         return False
 
     def run(self):
-
+        try:
             while not self.stop.is_set():
 
                 current_time = datetime.datetime.now()
@@ -73,14 +73,10 @@ class Scheduler(threading.Thread):
                 if should_run:
                     self.lastRun = current_time
 
-                try:
                     if not self.silent:
                         logger.log(u"Starting new thread: " + self.name, logger.DEBUG)
 
                     self.action.run(self.force)
-                except Exception, e:
-                    logger.log(u"Exception generated in thread " + self.name + ": " + ex(e), logger.ERROR)
-                    logger.log(repr(traceback.format_exc()), logger.DEBUG)
 
                 if self.force:
                     self.force = False
@@ -89,3 +85,6 @@ class Scheduler(threading.Thread):
 
             # exiting thread
             self.stop.clear()
+        except Exception, e:
+            logger.log(u"Exception generated in thread " + self.name + ": " + ex(e), logger.ERROR)
+            logger.log(repr(traceback.format_exc()), logger.DEBUG)
\ No newline at end of file