Let worker ungracefully exit on memoryExceeded

laravel · Jan 12, 2017 · 16a0d7d · 16a0d7d
1 parent e480e17
commit 16a0d7d
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/src/Illuminate/Queue/Worker.php b/src/Illuminate/Queue/Worker.php
@@ -77,8 +77,11 @@ public function daemon($connectionName, $queue, WorkerOptions $options)
                 $this->sleep($options->sleep);
             }
 
-            if ($this->memoryExceeded($options->memory) ||
-                $this->queueShouldRestart($lastRestart)) {
+            if ($this->memoryExceeded($options->memory)) {
+                $this->stop(1);
+            }
+
+            if ($this->queueShouldRestart($lastRestart)) {
                 $this->stop();
             }
         }
@@ -389,11 +392,11 @@ public function memoryExceeded($memoryLimit)
      *
      * @return void
      */
-    public function stop()
+    public function stop($status = 0)
     {
         $this->events->fire(new Events\WorkerStopping);
 
-        die;
+        exit($status);
     }
 
     /**