jenkins-bot has submitted this change and it was merged.

Change subject: Don't log an error when delaying a message
......................................................................


Don't log an error when delaying a message

Change-Id: Iff5da525899dea02c9d876f2672accd79b5e411d
---
M Core/QueueConsumers/BaseQueueConsumer.php
1 file changed, 13 insertions(+), 5 deletions(-)

Approvals:
  Awight: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/Core/QueueConsumers/BaseQueueConsumer.php 
b/Core/QueueConsumers/BaseQueueConsumer.php
index f13a588..b3e5f26 100644
--- a/Core/QueueConsumers/BaseQueueConsumer.php
+++ b/Core/QueueConsumers/BaseQueueConsumer.php
@@ -137,11 +137,19 @@
        protected function sendToDamagedStore(
                $message, Exception $ex, $retryDate = null
        ) {
-               Logger::error(
-                       'Error processing message, moving to damaged store.',
-                       $message,
-                       $ex
-               );
+               if ( $retryDate ) {
+                       Logger::notice(
+                               'Message not fully baked. Sticking it back in 
the oven, to ' .
+                               "retry at $retryDate",
+                               $message
+                       );
+               } else {
+                       Logger::error(
+                               'Error processing message, moving to damaged 
store.',
+                               $message,
+                               $ex
+                       );
+               }
                return $this->damagedDb->storeMessage(
                        $message,
                        $this->queueName,

-- 
To view, visit https://gerrit.wikimedia.org/r/314332
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Iff5da525899dea02c9d876f2672accd79b5e411d
Gerrit-PatchSet: 2
Gerrit-Project: wikimedia/fundraising/SmashPig
Gerrit-Branch: master
Gerrit-Owner: Ejegg <eeggles...@wikimedia.org>
Gerrit-Reviewer: Awight <awi...@wikimedia.org>
Gerrit-Reviewer: Cdentinger <cdentin...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to