Merge pull request phacility#65 from CodeBlock/master

D975

Author: Evan Priestley

scripts/daemon/phabricator_daemon_launcher.php

@@ -45,7 +45,8 @@ function must_have_extension($ext) {
     exit($err);
 
   case 'stop':
-    $err = $control->executeStopCommand();
+    $pass_argv = array_slice($argv, 2);
+    $err = $control->executeStopCommand($pass_argv);
     exit($err);
 
   case 'repository-launch-readonly':

src/infrastructure/daemon/control/PhabricatorDaemonControl.php

@@ -69,15 +69,36 @@ public function executeStatusCommand() {
     return 0;
   }
 
-  public function executeStopCommand() {
+  public function executeStopCommand($pids = null) {
     $daemons = $this->loadRunningDaemons();
     if (!$daemons) {
       echo "There are no running Phabricator daemons.\n";
       return 0;
     }
 
-    $running = $daemons;
+    $daemons = mpull($daemons, null, 'getPID');
 
+    $running = array();
+    if ($pids == null) {
+      $running = $daemons;
+    } else {
+      // We were given a PID or set of PIDs to kill.
+      foreach ($pids as $key => $pid) {
+        if (empty($daemons[$pid])) {
+          echo "{$pid} is not Phabricator-controlled. Not killing.\n";
+          continue;
+        } else {
+          $running[] = $daemons[$pid];
+        }
+      }
+    }
+
+    if (empty($running)) {
+      echo "No daemons to kill.\n";
+      return 0;
+    }
+
+    $killed = array();
     foreach ($running as $key => $daemon) {
       $pid = $daemon->getPID();
       $name = $daemon->getName();
@@ -88,6 +109,7 @@ public function executeStopCommand() {
         unset($running[$key]);
       } else {
         posix_kill($pid, SIGINT);
+        $killed[] = $daemon;
       }
     }
 
@@ -110,9 +132,10 @@ public function executeStopCommand() {
       $pid = $daemon->getPID();
       echo "KILLing daemon {$pid}.\n";
       posix_kill($pid, SIGKILL);
+      $killed[] = $daemon;
     }
 
-    foreach ($daemons as $daemon) {
+    foreach ($killed as $daemon) {
       if ($daemon->getPIDFile()) {
         Filesystem::remove($daemon->getPIDFile());
       }
@@ -136,14 +159,12 @@ public function executeHelpCommand() {
         **list**
             List available daemons.
 
-        **stop**
-            Stop all daemons.
-
         **status**
             List running daemons.
 
-        **stop**
-            Stop all running daemons.
+        **stop** [PID ...]
+            Stop all running daemons if no PIDs are given, or a particular
+            PID or set of PIDs, if they are supplied.
 
         **help**
             Show this help.
@@ -307,6 +328,4 @@ protected function loadRunningDaemons() {
   protected function killDaemon(PhabricatorDaemonReference $ref) {
   }
 
-
-
 }