Page MenuHomePhabricator
Files F13214484

D17390.id41830.diff
No OneTemporary
Actions

D17390.id41830.diff
View Options

diff --git a/src/applications/daemon/management/PhabricatorDaemonManagementDebugWorkflow.php b/src/applications/daemon/management/PhabricatorDaemonManagementDebugWorkflow.php
--- a/src/applications/daemon/management/PhabricatorDaemonManagementDebugWorkflow.php
+++ b/src/applications/daemon/management/PhabricatorDaemonManagementDebugWorkflow.php
@@ -28,10 +28,6 @@
'instead of the configured %s',
'phd.user'),
),
- array(
- 'name' => 'autoscale',
- 'help' => pht('Put the daemon in an autoscale group.'),
- ),
));
}
@@ -44,16 +40,11 @@
pht('You must specify which daemon to debug.'));
}
- $config = array();
-
- $config['class'] = array_shift($argv);
- $config['argv'] = $argv;
-
- if ($args->getArg('autoscale')) {
- $config['autoscale'] = array(
- 'group' => 'debug',
- );
- }
+ $config = array(
+ 'class' => array_shift($argv),
+ 'label' => 'debug',
+ 'argv' => $argv,
+ );
return $this->launchDaemons(
array(
diff --git a/src/applications/daemon/management/PhabricatorDaemonManagementWorkflow.php b/src/applications/daemon/management/PhabricatorDaemonManagementWorkflow.php
--- a/src/applications/daemon/management/PhabricatorDaemonManagementWorkflow.php
+++ b/src/applications/daemon/management/PhabricatorDaemonManagementWorkflow.php
@@ -362,17 +362,17 @@
$daemons = array(
array(
'class' => 'PhabricatorRepositoryPullLocalDaemon',
+ 'label' => 'pull',
),
array(
'class' => 'PhabricatorTriggerDaemon',
+ 'label' => 'trigger',
),
array(
'class' => 'PhabricatorTaskmasterDaemon',
- 'autoscale' => array(
- 'group' => 'task',
- 'pool' => PhabricatorEnv::getEnvConfig('phd.taskmasters'),
- 'reserve' => idx($options, 'reserve', 0),
- ),
+ 'label' => 'task',
+ 'pool' => PhabricatorEnv::getEnvConfig('phd.taskmasters'),
+ 'reserve' => idx($options, 'reserve', 0),
),
);
@@ -618,23 +618,12 @@
pht('(Logs will appear in "%s".)', $log_dir));
foreach ($daemons as $daemon) {
- $is_autoscale = isset($daemon['autoscale']['group']);
- if ($is_autoscale) {
- $autoscale = $daemon['autoscale'];
- foreach ($autoscale as $key => $value) {
- $autoscale[$key] = $key.'='.$value;
- }
- $autoscale = implode(', ', $autoscale);
-
- $autoscale = pht('(Autoscaling: %s)', $autoscale);
- } else {
- $autoscale = pht('(Static)');
- }
+ $pool_size = pht('(Pool: %s)', idx($daemon, 'pool', 1));
$console->writeOut(
" %s %s\n",
+ $pool_size,
$daemon['class'],
- $autoscale,
implode(' ', idx($daemon, 'argv', array())));
}
$console->writeOut("\n");

File Metadata

Mime Type
text/plain
Expires
Sat, May 18, 10:46 AM (4 w, 6 h ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
6293510
Default Alt Text
D17390.id41830.diff (2 KB)

Event Timeline

Phabricator · Built by Phacility