@recaptime-dev's working patches + fork for Phorge, a community fork of Phabricator. (Upstream dev and stable branches are at upstream/main and upstream/stable respectively.)
hq.recaptime.dev/wiki/Phorge
phorge
phabricator
Config - add phd.variant-config to suppress "Daemon & Web config" error message on a per key basis
Summary: Fixes T6959.
Test Plan: When I was ready to test the feature, the "Daemon & Web config" error already showed up, from having added phd.variant-config. I went meta and changed the value of phd.variant-config to have phd.variant-config. The config error disappeared. I then changed the conpherence setting about conpherence email prefix and the error showed up again. Removing the conpherence config setting made the error disappear once more.
Reviewers: epriestley
Reviewed By: epriestley
Subscribers: Korvin, epriestley
Maniphest Tasks: T6959
Differential Revision: https://secure.phabricator.com/D11399
+11
-1
+7
src/applications/config/option/PhabricatorPHDConfigOptions.php
+7
src/applications/config/option/PhabricatorPHDConfigOptions.php
···
63
63
"ENORMOUS amount of output, but can help debug issues. Daemons ".
64
64
"launched in debug mode with 'phd debug' are always launched in ".
65
65
"trace mdoe. See also 'phd.verbose'.")),
66
+
$this->newOption('phd.variant-config', 'list<string>', array())
67
+
->setDescription(
68
+
pht(
69
+
'Specify config keys that can safely vary between the web tier '.
70
+
'and the daemons. Primarily, this is a way to suppress the '.
71
+
'"Daemons and Web Have Different Config" setup issue on a per '.
72
+
'config key basis.')),
66
73
);
67
74
}
68
75
+4
-1
src/infrastructure/env/PhabricatorEnv.php
+4
-1
src/infrastructure/env/PhabricatorEnv.php
···
232
232
233
233
public static function calculateEnvironmentHash() {
234
234
$keys = array_keys(self::getAllConfigKeys());
235
-
ksort($keys);
235
+
sort($keys);
236
+
237
+
$skip_keys = self::getEnvConfig('phd.variant-config');
238
+
$keys = array_diff($keys, $skip_keys);
236
239
237
240
$values = array();
238
241
foreach ($keys as $key) {