Fix Timeoutless Job (#19266)

laravel · May 20, 2017 · 650f74c · 650f74c
1 parent 7dbe8fd
commit 650f74c
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/src/Illuminate/Queue/Worker.php b/src/Illuminate/Queue/Worker.php
@@ -131,15 +131,17 @@ public function daemon($connectionName, $queue, WorkerOptions $options)
      */
     protected function registerTimeoutHandler($job, WorkerOptions $options)
     {
-        if ($options->timeout > 0 && $this->supportsAsyncSignals()) {
+        $timeout = $this->timeoutForJob($job, $options);
+
+        if ($timeout > 0 && $this->supportsAsyncSignals()) {
             // We will register a signal handler for the alarm signal so that we can kill this
             // process if it is running too long because it has frozen. This uses the async
             // signals supported in recent versions of PHP to accomplish it conveniently.
             pcntl_signal(SIGALRM, function () {
                 $this->kill(1);
             });
 
-            pcntl_alarm($this->timeoutForJob($job, $options) + $options->sleep);
+            pcntl_alarm($timeout + $options->sleep);
         }
     }