Selaa lähdekoodia

Fix up exception handling.

Ask Solem 16 vuotta sitten
vanhempi
commit
751f907f17
2 muutettua tiedostoa jossa 1 lisäystä ja 3 poistoa
  1. 0 1
      celery/bin/celeryd
  2. 1 2
      celery/worker.py

+ 0 - 1
celery/bin/celeryd

@@ -45,7 +45,6 @@ def main(concurrency=DAEMON_CONCURRENCY, daemon=False,
     try:
     try:
         celeryd.run()
         celeryd.run()
     except Exception, e:
     except Exception, e:
-        raise
         emergency_error(logfile, "celeryd raised exception %s: %s\n%s" % (
         emergency_error(logfile, "celeryd raised exception %s: %s\n%s" % (
                             e.__class__, e, traceback.format_exc()))
                             e.__class__, e, traceback.format_exc()))
 
 

+ 1 - 2
celery/worker.py

@@ -94,8 +94,7 @@ class TaskDaemon(object):
                 time.sleep(self.queue_wakeup_after)
                 time.sleep(self.queue_wakeup_after)
                 continue
                 continue
             except UnknownTask, e:
             except UnknownTask, e:
-                self.logger.info("Unknown task requeued and ignored: %s" % (
-                                    e))
+                self.logger.info("Unknown task ignored: %s" % (e))
                 continue
                 continue
             except Exception, e:
             except Exception, e:
                 self.logger.critical("Message queue raised %s: %s\n%s" % (
                 self.logger.critical("Message queue raised %s: %s\n%s" % (