From c551797819d56521dfcda4bffd76375f9e0a9441 Mon Sep 17 00:00:00 2001 From: Aaron Schulz Date: Fri, 14 Aug 2015 16:47:55 -0700 Subject: [PATCH] Include job UUID in doAck() error message Change-Id: Ib84a55bd92802684b98cc1cf06e5414bd1bd9fd6 --- includes/jobqueue/JobQueueRedis.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/includes/jobqueue/JobQueueRedis.php b/includes/jobqueue/JobQueueRedis.php index e021d99b4d..a038ab5e00 100644 --- a/includes/jobqueue/JobQueueRedis.php +++ b/includes/jobqueue/JobQueueRedis.php @@ -365,6 +365,7 @@ LUA; 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 @@ LUA; $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; } -- 2.20.1