diff options
author | Craig Andrews <candrews@integralblue.com> | 2010-02-02 17:00:10 -0500 |
---|---|---|
committer | Craig Andrews <candrews@integralblue.com> | 2010-02-02 17:00:10 -0500 |
commit | 057ec1fceacbfec1f755a5bc6700a188aa70e33f (patch) | |
tree | 297839a71d9d3a7a0a7935d5dbcc9c4a3c6c99bb /scripts/queuedaemon.php | |
parent | d14651706cf728f116b7ae44c6a6e37b5eb918a4 (diff) | |
parent | f60f2c523f2e7018ea923898931287e7a99e8f44 (diff) |
Merge branch '0.9.x' into 1.0.x
Conflicts:
EVENTS.txt
lib/imqueuehandler.php
lib/jabber.php
lib/util.php
plugins/Xmpp/Sharing_XMPP.php
Diffstat (limited to 'scripts/queuedaemon.php')
-rwxr-xr-x | scripts/queuedaemon.php | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/scripts/queuedaemon.php b/scripts/queuedaemon.php index c2e2351c3..30a8a9602 100755 --- a/scripts/queuedaemon.php +++ b/scripts/queuedaemon.php @@ -109,7 +109,13 @@ class QueueDaemon extends SpawningDaemon $master = new QueueMaster($this->get_id()); $master->init($this->all); - $master->service(); + try { + $master->service(); + } catch (Exception $e) { + common_log(LOG_ERR, "Unhandled exception: " . $e->getMessage() . ' ' . + str_replace("\n", " ", $e->getTraceAsString())); + return self::EXIT_ERR; + } $this->log(LOG_INFO, 'finished servicing the queue'); |