D11873.id28595.diff
No OneTemporary
Actions

Size

944 B

Referenced Files

None

Subscribers

None

D11873.id28595.diff
View Options

	diff --git a/src/infrastructure/daemon/control/PhabricatorDaemonReference.php b/src/infrastructure/daemon/control/PhabricatorDaemonReference.php
	--- a/src/infrastructure/daemon/control/PhabricatorDaemonReference.php
	+++ b/src/infrastructure/daemon/control/PhabricatorDaemonReference.php
	@@ -40,6 +40,20 @@
	$logs = mpull($logs, null, 'getDaemonID');
	}

	+ // Support PID files that use the old daemon format, where each overseer
	+ // had exactly one daemon. We can eventually remove this; they will still
	+ // be stopped by `phd stop --force` even if we don't identify them here.
	+ if (!$daemons && idx($dict, 'name')) {
	+ $daemons = array(
	+ array(
	+ 'config' => array(
	+ 'class' => idx($dict, 'name'),
	+ 'argv' => idx($dict, 'argv', array()),
	+ ),
	+ ),
	+ );
	+ }
	+
	foreach ($daemons as $daemon) {
	$ref = new PhabricatorDaemonReference();