From fc06c599bc94a82c1f602723032ff2de907f3a58 Mon Sep 17 00:00:00 2001 From: Mikael Nordfeldth Date: Tue, 16 Aug 2016 20:27:41 +0200 Subject: [PATCH] dbqueuemanager should ignore on no-result-exceptions --- lib/dbqueuemanager.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/lib/dbqueuemanager.php b/lib/dbqueuemanager.php index 4440a4d930..6a2952c28f 100644 --- a/lib/dbqueuemanager.php +++ b/lib/dbqueuemanager.php @@ -95,11 +95,14 @@ class DBQueueManager extends QueueManager } catch (NoQueueHandlerException $e) { $this->noHandlerFound($qi, $rep); return true; + } catch (NoResultException $e) { + $this->_log(LOG_ERR, "[{$qi->transport}:$rep] ".get_class($e).' thrown ('._ve($e->getMessage()).'), ignoring queue_item '._ve($qi->getID())); + $result = true; } catch (AlreadyFulfilledException $e) { - $this->_log(LOG_ERR, "[{$qi->transport}:$rep] AlreadyFulfilledException thrown: {$e->getMessage()}"); + $this->_log(LOG_ERR, "[{$qi->transport}:$rep] ".get_class($e).' thrown ('._ve($e->getMessage()).'), ignoring queue_item '._ve($qi->getID())); $result = true; } catch (Exception $e) { - $this->_log(LOG_ERR, "[{$qi->transport}:$rep] Exception thrown: {$e->getMessage()}"); + $this->_log(LOG_ERR, "[{$qi->transport}:$rep] Exception (".get_class($e).') thrown: '._ve($e->getMessage())); $result = false; }