D11385.diff
No OneTemporary
Actions

Size

960 B

Referenced Files

None

Subscribers

None

D11385.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
	@@ -32,11 +32,16 @@
	$ref->pid = idx($dict, 'pid');
	$ref->start = idx($dict, 'start');

	- $ref->daemonLog = id(new PhabricatorDaemonLog())->loadOneWhere(
	- 'daemon = %s AND pid = %d AND dateCreated = %d',
	- $ref->name,
	- $ref->pid,
	- $ref->start);
	+ try {
	+ $ref->daemonLog = id(new PhabricatorDaemonLog())->loadOneWhere(
	+ 'daemon = %s AND pid = %d AND dateCreated = %d',
	+ $ref->name,
	+ $ref->pid,
	+ $ref->start);
	+ } catch (AphrontQueryException $ex) {
	+ // Ignore the exception. We want to be able to terminate the daemons,
	+ // even if MySQL is down.
	+ }

	return $ref;
	}