Improve stop command

anystack-sh · Jan 10, 2023 · ff19010 · ff19010
1 parent 499aadc
commit ff19010
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 4 deletions.
diff --git a/app/Commands/StopCommand.php b/app/Commands/StopCommand.php
@@ -12,7 +12,7 @@ class StopCommand extends Command
      *
      * @var string
      */
-    protected $signature = 'stop';
+    protected $signature = 'stop {--force}';
 
     /**
      * The description of the command.
@@ -29,7 +29,7 @@ class StopCommand extends Command
     public function handle(SupervisordRepository $repository)
     {
         $this->task('Stopping services', function () use ($repository) {
-            return $repository->stopSupervisord();
+            return $repository->stopSupervisord($this->option('force'));
         });
     }
 }
diff --git a/app/Repositories/SupervisordRepository.php b/app/Repositories/SupervisordRepository.php
@@ -129,7 +129,7 @@ public function startSupervisord()
         exec($supervisordPath.' -c '.Storage::disk()->path('supervisord.conf'));
     }
 
-    public function stopSupervisord()
+    public function stopSupervisord($force = false)
     {
         if (Storage::exists('supervisord.pid') === false) {
             return true;
@@ -138,11 +138,21 @@ public function stopSupervisord()
         posix_kill(Storage::get('supervisord.pid'), SIGTERM);
 
         while (true) {
-            if (file_exists(Storage::path('supervisord.pid')) === false) {
+            try {
+                $this->getAllProcessInfo();
+                sleep(1);
+            } catch (SupervisordConnectionRefusedException $e) {
+                // Shutdown complete
                 break;
+            } catch (SupervisordShutdownStateException $e) {
+                // Shutting down
             }
         }
 
+        if($force) {
+            Storage::delete('supervisord.pid');
+        }
+
         return true;
     }