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

Change subject: Include job UUID in doAck() error message
......................................................................


Include job UUID in doAck() error message

Change-Id: Ib84a55bd92802684b98cc1cf06e5414bd1bd9fd6
---
M includes/jobqueue/JobQueueRedis.php
1 file changed, 3 insertions(+), 2 deletions(-)

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



diff --git a/includes/jobqueue/JobQueueRedis.php 
b/includes/jobqueue/JobQueueRedis.php
index e021d99..a038ab5 100644
--- a/includes/jobqueue/JobQueueRedis.php
+++ b/includes/jobqueue/JobQueueRedis.php
@@ -365,6 +365,7 @@
                        throw new UnexpectedValueException( "Job of type 
'{$job->getType()}' has no UUID." );
                }
 
+               $uuid = $job->metadata['uuid'];
                $conn = $this->getConnection();
                try {
                        static $script =
@@ -381,13 +382,13 @@
                                        $this->getQueueKey( 'z-claimed' ), # 
KEYS[1]
                                        $this->getQueueKey( 'h-attempts' ), # 
KEYS[2]
                                        $this->getQueueKey( 'h-data' ), # 
KEYS[3]
-                                       $job->metadata['uuid'] # ARGV[1]
+                                       $uuid # ARGV[1]
                                ),
                                3 # number of first argument(s) that are keys
                        );
 
                        if ( !$res ) {
-                               wfDebugLog( 'JobQueueRedis', "Could not 
acknowledge {$this->type} job." );
+                               wfDebugLog( 'JobQueueRedis', "Could not 
acknowledge {$this->type} job $uuid." );
 
                                return false;
                        }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib84a55bd92802684b98cc1cf06e5414bd1bd9fd6
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz <[email protected]>
Gerrit-Reviewer: Legoktm <[email protected]>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to