D9749.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D9749.diff
View Options

	diff --git a/src/applications/daemon/storage/PhabricatorDaemonLog.php b/src/applications/daemon/storage/PhabricatorDaemonLog.php
	--- a/src/applications/daemon/storage/PhabricatorDaemonLog.php
	+++ b/src/applications/daemon/storage/PhabricatorDaemonLog.php
	@@ -13,7 +13,7 @@
	protected $host;
	protected $pid;
	protected $argv;
	- protected $explicitArgv;
	+ protected $explicitArgv = array();
	protected $status;

	public function getConfiguration() {
	@@ -25,6 +25,14 @@
	) + parent::getConfiguration();
	}

	+ public function getExplicitArgv() {
	+ $argv = $this->explicitArgv;
	+ if (!is_array($argv)) {
	+ return array();
	+ }
	+ return $argv;
	+ }
	+

	/* -( PhabricatorPolicyInterface )----------------------------------------- */

	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
	@@ -12,7 +12,13 @@

	public static function newFromFile($path) {
	$pid_data = Filesystem::readFile($path);
	- $dict = phutil_json_decode($pid_data);
	+
	+ try {
	+ $dict = phutil_json_decode($pid_data);
	+ } catch (PhutilJSONParserException $ex) {
	+ $dict = array();
	+ }
	+
	$ref = self::newFromDictionary($dict);
	$ref->pidFile = $path;
	return $ref;