dont die option for supervisor

changelog.md

@@ -1,5 +1,9 @@
 # Change Log
 
+#v0.7.0
+- Supervisor can return instead of exit using dontDie option.
+- Bugfix in handling Throwable errors.
+
 #v0.6.1
 - New feature: Process.
 

src/Supervisor/Supervisor.php

@@ -13,7 +13,6 @@
 use Illuminate\Contracts\Events\Dispatcher as Events;
 use Illuminate\Contracts\Foundation\Application;
 use Closure;
-use Symfony\Component\Debug\Exception\FatalThrowableError;
 
 class Supervisor
 {
@@ -63,6 +62,7 @@ public function __construct(Application $laravel, Cache $cache, Bus $bus, Events
      *
      * @param Closure|string|object $command
      * @param SupervisorOptions|null $options
+     * @return int
      */
     public function supervise($command, SupervisorOptions $options = null)
     {
@@ -92,6 +92,9 @@ public function supervise($command, SupervisorOptions $options = null)
             // this process should restart based on other indications. If so, we'll stop
             // this process and let whatever is "monitoring" it restart the process.
             $this->stopIfNecessary($options, $state);
+            if ($state->exitStatus !== false) {
+                return $state->exitStatus;
+            }
         }
     }
 
@@ -107,18 +110,11 @@ protected function run(Closure $closure, SupervisorOptions $options, SupervisorS
         try {
             $closure();
             $this->events->dispatch(new RunSucceed($options, $state));
-        } catch (\Exception $e) {
-            if ($options->stopOnError) {
-                $state->shouldQuit = true;
-            }
-            $this->exceptions->report($e);
-            $this->events->dispatch(new RunFailed($options, $state, $e));
-            sleep(1);
         } catch (\Throwable $e) {
             if ($options->stopOnError) {
                 $state->shouldQuit = true;
             }
-            $this->exceptions->report(new FatalThrowableError($e));
+            $this->exceptions->report($e);
             $this->events->dispatch(new RunFailed($options, $state, $e));
             sleep(1);
         }
@@ -261,10 +257,10 @@ protected function memoryExceeded($memoryLimit)
     protected function stopIfNecessary(SupervisorOptions $options, SupervisorState $state)
     {
         if ($this->memoryExceeded($options->memory)) {
-            $this->stop(12);
+            $this->stop(12, ! $options->dontDie, $state);
         } elseif ($state->shouldQuit || $this->shouldRestart($state->lastRestart) ||
             $this->events->until(new LoopCompleting($options, $state)) === false) {
-            $this->stop();
+            $this->stop(0, ! $options->dontDie, $state);
         }
     }
 
@@ -280,13 +276,19 @@ protected function pause()
      * Stop listening and bail out of the script.
      *
      * @param  int  $status
+     * @param  bool  $exit
+     * @param  SupervisorState  $state
      * @return void
      */
-    protected function stop($status = 0)
+    protected function stop($status, $exit, SupervisorState $state)
     {
+        $state->exitStatus = $status;
+
         $this->events->dispatch(new SupervisorStopping($status));
 
-        exit($status);
+        if ($exit) {
+            exit($status);
+        }
     }
 
     /**

src/Supervisor/SupervisorOptions.php

@@ -32,17 +32,26 @@ class SupervisorOptions
      */
     public $stopOnError;
 
+    /**
+     * Prefer to return instead of calling exit() if possible.
+     *
+     * @var bool
+     */
+    public $dontDie;
+
     /**
      * @param int $timeout
      * @param int|float $memory
      * @param bool $force
      * @param bool $stopOnError
+     * @param bool $dontDie
      */
-    public function __construct($timeout = 60, $memory = 128, $force = false, $stopOnError = false)
+    public function __construct($timeout = 60, $memory = 128, $force = false, $stopOnError = false, $dontDie = false)
     {
         $this->timeout = $timeout;
         $this->memory = $memory;
         $this->force = $force;
         $this->stopOnError = $stopOnError;
+        $this->dontDie = $dontDie;
     }
 }

src/Supervisor/SupervisorState.php

@@ -22,4 +22,9 @@ class SupervisorState
      * @var int|null
      */
     public $lastRestart;
+
+    /**
+     * @var false|int
+     */
+    public $exitStatus = false;
 }