Page MenuHomestyx hydra
Files F83105

No OneTemporary
Actions

View Options

diff --git a/src/applications/daemon/management/PhabricatorDaemonManagementRestartWorkflow.php b/src/applications/daemon/management/PhabricatorDaemonManagementRestartWorkflow.php
index 5a1b46ef1a..eb2d5d229c 100644
--- a/src/applications/daemon/management/PhabricatorDaemonManagementRestartWorkflow.php
+++ b/src/applications/daemon/management/PhabricatorDaemonManagementRestartWorkflow.php
@@ -1,53 +1,54 @@
<?php
final class PhabricatorDaemonManagementRestartWorkflow
extends PhabricatorDaemonManagementWorkflow {
protected function didConstruct() {
$this
->setName('restart')
- ->setSynopsis(pht('Stop, then start the standard daemon loadout.'))
+ ->setSynopsis(
+ pht(
+ 'Stop daemon processes on this host, then start the standard '.
+ 'daemon loadout.'))
->setArguments(
array(
array(
'name' => 'graceful',
'param' => 'seconds',
'help' => pht(
'Grace period for daemons to attempt a clean shutdown, in '.
'seconds. Defaults to __15__ seconds.'),
'default' => 15,
),
array(
- 'name' => 'gently',
+ 'name' => 'force',
'help' => pht(
- 'Ignore running processes that look like daemons but do not '.
- 'have corresponding PID files.'),
+ 'Stop all daemon processes on this host, even if they belong '.
+ 'to another Phabricator instance.'),
),
array(
- 'name' => 'force',
- 'help' => pht(
- 'Also stop running processes that look like daemons but do '.
- 'not have corresponding PID files.'),
+ 'name' => 'gently',
+ 'help' => pht('Deprecated. Has no effect.'),
),
$this->getAutoscaleReserveArgument(),
));
}
public function execute(PhutilArgumentParser $args) {
$err = $this->executeStopCommand(
array(
'graceful' => $args->getArg('graceful'),
'force' => $args->getArg('force'),
- 'gently' => $args->getArg('gently'),
));
+
if ($err) {
return $err;
}
return $this->executeStartCommand(
array(
'reserve' => (float)$args->getArg('autoscale-reserve'),
));
}
}
diff --git a/src/applications/daemon/management/PhabricatorDaemonManagementStopWorkflow.php b/src/applications/daemon/management/PhabricatorDaemonManagementStopWorkflow.php
index 6f982f3e42..19b9fc44fb 100644
--- a/src/applications/daemon/management/PhabricatorDaemonManagementStopWorkflow.php
+++ b/src/applications/daemon/management/PhabricatorDaemonManagementStopWorkflow.php
@@ -1,52 +1,41 @@
<?php
final class PhabricatorDaemonManagementStopWorkflow
extends PhabricatorDaemonManagementWorkflow {
protected function didConstruct() {
$this
->setName('stop')
- ->setSynopsis(
- pht(
- 'Stop all running daemons, or specific daemons identified by PIDs. '.
- 'Use **%s** to find PIDs.',
- 'phd status'))
+ ->setSynopsis(pht('Stop daemon processes on this host.'))
->setArguments(
array(
array(
'name' => 'graceful',
'param' => 'seconds',
'help' => pht(
'Grace period for daemons to attempt a clean shutdown, in '.
'seconds. Defaults to __15__ seconds.'),
'default' => 15,
),
array(
'name' => 'force',
'help' => pht(
- 'Also stop running processes that look like daemons but do '.
- 'not have corresponding PID files.'),
+ 'Stop all daemon processes on this host, even if they belong '.
+ 'to another Phabricator instance.'),
),
array(
'name' => 'gently',
- 'help' => pht(
- 'Ignore running processes that look like daemons but do not '.
- 'have corresponding PID files.'),
- ),
- array(
- 'name' => 'pids',
- 'wildcard' => true,
+ 'help' => pht('Deprecated. Has no effect.'),
),
));
}
public function execute(PhutilArgumentParser $args) {
return $this->executeStopCommand(
array(
'graceful' => $args->getArg('graceful'),
'force' => $args->getArg('force'),
- 'gently' => $args->getArg('gently'),
));
}
}

File Metadata

Mime Type
text/x-diff
Expires
Fri, Mar 14, 7:01 AM (3 h, 15 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
71657
Default Alt Text
(4 KB)

Event Timeline

styx copyright 2020 sirocyl / ellie (kymkdd) / ncommander / styx contributors
Use of other names and brands is not intended to reflect a claim of, or right to, use the name or brand.
styx is an operating system using the Linux kernel and components, and "styx Linux" as a phrase does not reflect the inclusion of the Linux brand or trademark in the styx project.
Linux® is the registered trademark of Linus Torvalds in the U.S. and other countries.
Terms and Conditions (TODO: fix this!)