Page MenuHomePhabricator
Files F15471120

D21426.id50982.diff
No OneTemporary
Actions

D21426.id50982.diff
View Options

diff --git a/src/applications/config/option/PhabricatorPHDConfigOptions.php b/src/applications/config/option/PhabricatorPHDConfigOptions.php
--- a/src/applications/config/option/PhabricatorPHDConfigOptions.php
+++ b/src/applications/config/option/PhabricatorPHDConfigOptions.php
@@ -43,22 +43,6 @@
"configuration changes are picked up by the daemons ".
"automatically, but pool sizes can not be changed without a ".
"restart.")),
- $this->newOption('phd.verbose', 'bool', false)
- ->setLocked(true)
- ->setBoolOptions(
- array(
- pht('Verbose mode'),
- pht('Normal mode'),
- ))
- ->setSummary(pht("Launch daemons in 'verbose' mode by default."))
- ->setDescription(
- pht(
- "Launch daemons in 'verbose' mode by default. This creates a lot ".
- "of output, but can help debug issues. Daemons launched in debug ".
- "mode with '%s' are always launched in verbose mode. ".
- "See also '%s'.",
- 'phd debug',
- 'phd.trace')),
$this->newOption('phd.user', 'string', null)
->setLocked(true)
->setSummary(pht('System user to run daemons as.'))
@@ -68,22 +52,6 @@
'user will own the working copies of any repositories that '.
'Phabricator imports or manages. This option is new and '.
'experimental.')),
- $this->newOption('phd.trace', 'bool', false)
- ->setLocked(true)
- ->setBoolOptions(
- array(
- pht('Trace mode'),
- pht('Normal mode'),
- ))
- ->setSummary(pht("Launch daemons in 'trace' mode by default."))
- ->setDescription(
- pht(
- "Launch daemons in 'trace' mode by default. This creates an ".
- "ENORMOUS amount of output, but can help debug issues. Daemons ".
- "launched in debug mode with '%s' are always launched in ".
- "trace mode. See also '%s'.",
- 'phd debug',
- 'phd.verbose')),
$this->newOption('phd.garbage-collection', 'wild', array())
->setLocked(true)
->setLockedMessage(
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
@@ -116,11 +116,11 @@
$trace = PhutilArgumentParser::isTraceModeEnabled();
$flags = array();
- if ($trace || PhabricatorEnv::getEnvConfig('phd.trace')) {
+ if ($trace) {
$flags[] = '--trace';
}
- if ($debug || PhabricatorEnv::getEnvConfig('phd.verbose')) {
+ if ($debug) {
$flags[] = '--verbose';
}
diff --git a/src/infrastructure/daemon/workers/PhabricatorTaskmasterDaemon.php b/src/infrastructure/daemon/workers/PhabricatorTaskmasterDaemon.php
--- a/src/infrastructure/daemon/workers/PhabricatorTaskmasterDaemon.php
+++ b/src/infrastructure/daemon/workers/PhabricatorTaskmasterDaemon.php
@@ -24,7 +24,7 @@
if ($ex) {
if ($ex instanceof PhabricatorWorkerPermanentFailureException) {
// NOTE: Make sure these reach the daemon log, even when not
- // running in "phd.verbose" mode. See T12803 for discussion.
+ // running in verbose mode. See T12803 for discussion.
$log_exception = new PhutilProxyException(
pht(
'Task "%s" encountered a permanent failure and was '.

File Metadata

Mime Type
text/plain
Expires
Sun, Apr 6, 3:22 AM (2 w, 3 d ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
7733901
Default Alt Text
D21426.id50982.diff (3 KB)

Event Timeline

Phabricator · Built by Phacility