revi-archive/phorge-phorge
1
0
Fork 0
mirror of https://we.phorge.it/source/phorge.git synced 2025-02-18 01:38:39 +01:00
Code Issues Releases Wiki Activity

Merge pull request #65 from CodeBlock/master

Browse source 
D975
This commit is contained in:
Evan Priestley 2011-10-01 16:41:24 -07:00
commit ceceb47033
2 changed files with 31 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
scripts/daemon/phabricator_daemon_launcher.php
View file

@ -45,7 +45,8 @@ switch (isset($argv[1]) ? $argv[1] : 'help') {
exit($err); exit($err);
case 'stop': case 'stop':
$err = $control->executeStopCommand(); $pass_argv = array_slice($argv, 2);
$err = $control->executeStopCommand($pass_argv);
exit($err); exit($err);
case 'repository-launch-readonly': case 'repository-launch-readonly':

39
src/infrastructure/daemon/control/PhabricatorDaemonControl.php
View file

@ -69,15 +69,36 @@ final class PhabricatorDaemonControl {
return 0; return 0;
} }
public function executeStopCommand() { public function executeStopCommand($pids = null) {
$daemons = $this->loadRunningDaemons(); $daemons = $this->loadRunningDaemons();
if (!$daemons) { if (!$daemons) {
echo "There are no running Phabricator daemons.\n"; echo "There are no running Phabricator daemons.\n";
return 0; 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) { foreach ($running as $key => $daemon) {
$pid = $daemon->getPID(); $pid = $daemon->getPID();
$name = $daemon->getName(); $name = $daemon->getName();
@ -88,6 +109,7 @@ final class PhabricatorDaemonControl {
unset($running[$key]); unset($running[$key]);
} else { } else {
posix_kill($pid, SIGINT); posix_kill($pid, SIGINT);
$killed[] = $daemon;
} }
} }
@ -110,9 +132,10 @@ final class PhabricatorDaemonControl {
$pid = $daemon->getPID(); $pid = $daemon->getPID();
echo "KILLing daemon {$pid}.\n"; echo "KILLing daemon {$pid}.\n";
posix_kill($pid, SIGKILL); posix_kill($pid, SIGKILL);
$killed[] = $daemon;
} }
foreach ($daemons as $daemon) { foreach ($killed as $daemon) {
if ($daemon->getPIDFile()) { if ($daemon->getPIDFile()) {
Filesystem::remove($daemon->getPIDFile()); Filesystem::remove($daemon->getPIDFile());
} }
@ -136,14 +159,12 @@ final class PhabricatorDaemonControl {
**list** **list**
List available daemons. List available daemons.
**stop**
Stop all daemons.
**status** **status**
List running daemons. List running daemons.
**stop** **stop** [PID ...]
Stop all running daemons. Stop all running daemons if no PIDs are given, or a particular
PID or set of PIDs, if they are supplied.
**help** **help**
Show this help. Show this help.
@ -307,6 +328,4 @@ EOHELP
protected function killDaemon(PhabricatorDaemonReference $ref) { protected function killDaemon(PhabricatorDaemonReference $ref) {
} }
} }