View Options

	diff --git a/src/applications/daemon/storage/PhabricatorDaemonLog.php b/src/applications/daemon/storage/PhabricatorDaemonLog.php
	index d6f406f93d..d8f264f707 100644
	--- a/src/applications/daemon/storage/PhabricatorDaemonLog.php
	+++ b/src/applications/daemon/storage/PhabricatorDaemonLog.php
	@@ -1,53 +1,61 @@
	<?php

	final class PhabricatorDaemonLog extends PhabricatorDaemonDAO
	implements PhabricatorPolicyInterface {

	const STATUS_UNKNOWN = 'unknown';
	const STATUS_RUNNING = 'run';
	const STATUS_DEAD = 'dead';
	const STATUS_WAIT = 'wait';
	const STATUS_EXITED = 'exit';

	protected $daemon;
	protected $host;
	protected $pid;
	protected $argv;
	- protected $explicitArgv;
	+ protected $explicitArgv = array();
	protected $status;

	public function getConfiguration() {
	return array(
	self::CONFIG_SERIALIZATION => array(
	'argv' => self::SERIALIZATION_JSON,
	'explicitArgv' => self::SERIALIZATION_JSON,
	),
	) + parent::getConfiguration();
	}

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

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

	public function getPHID() {
	return null;
	}

	public function getCapabilities() {
	return array(
	PhabricatorPolicyCapability::CAN_VIEW,
	);
	}

	public function getPolicy($capability) {
	return PhabricatorPolicies::POLICY_ADMIN;
	}

	public function hasAutomaticCapability($capability, PhabricatorUser $viewer) {
	return false;
	}

	public function describeAutomaticCapability($capability) {
	return null;
	}

	}
	diff --git a/src/infrastructure/daemon/control/PhabricatorDaemonReference.php b/src/infrastructure/daemon/control/PhabricatorDaemonReference.php
	index d8eec4dda2..8a0283b85f 100644
	--- a/src/infrastructure/daemon/control/PhabricatorDaemonReference.php
	+++ b/src/infrastructure/daemon/control/PhabricatorDaemonReference.php
	@@ -1,131 +1,137 @@
	<?php

	final class PhabricatorDaemonReference {

	private $name;
	private $argv;
	private $pid;
	private $start;
	private $pidFile;

	private $daemonLog;

	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;
	}

	public static function newFromDictionary(array $dict) {
	$ref = new PhabricatorDaemonReference();

	$ref->name = idx($dict, 'name', 'Unknown');
	$ref->argv = idx($dict, 'argv', array());
	$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);

	return $ref;
	}

	public function updateStatus($new_status) {
	try {
	if (!$this->daemonLog) {
	$this->daemonLog = id(new PhabricatorDaemonLog())->loadOneWhere(
	'daemon = %s AND pid = %d AND dateCreated = %d',
	$this->name,
	$this->pid,
	$this->start);
	}

	if ($this->daemonLog) {
	$this->daemonLog
	->setStatus($new_status)
	->save();
	}
	} catch (AphrontQueryException $ex) {
	// Ignore anything that goes wrong here. We anticipate at least two
	// specific failure modes:
	//
	// - Upgrade scripts which run `git pull`, then `phd stop`, then
	// `bin/storage upgrade` will fail when trying to update the `status`
	// column, as it does not exist yet.
	// - Daemons running on machines which do not have access to MySQL
	// (like an IRC bot) will not be able to load or save the log.
	//
	//
	}
	}

	public function getPID() {
	return $this->pid;
	}

	public function getName() {
	return $this->name;
	}

	public function getArgv() {
	return $this->argv;
	}

	public function getEpochStarted() {
	return $this->start;
	}

	public function getPIDFile() {
	return $this->pidFile;
	}

	public function getDaemonLog() {
	return $this->daemonLog;
	}

	public function isRunning() {
	return self::isProcessRunning($this->getPID());
	}

	public static function isProcessRunning($pid) {
	if (!$pid) {
	return false;
	}

	if (function_exists('posix_kill')) {
	// This may fail if we can't signal the process because we are running as
	// a different user (for example, we are 'apache' and the process is some
	// other user's, or we are a normal user and the process is root's), but
	// we can check the error code to figure out if the process exists.
	$is_running = posix_kill($pid, 0);
	if (posix_get_last_error() == 1) {
	// "Operation Not Permitted", indicates that the PID exists. If it
	// doesn't, we'll get an error 3 ("No such process") instead.
	$is_running = true;
	}
	} else {
	// If we don't have the posix extension, just exec.
	list($err) = exec_manual('ps %s', $pid);
	$is_running = ($err == 0);
	}

	return $is_running;
	}

	public function waitForExit($seconds) {
	$start = time();
	while (time() < $start + $seconds) {
	usleep(100000);
	if (!$this->isRunning()) {
	return true;
	}
	}
	return !$this->isRunning();
	}

	}

File Metadata

Mime Type: text/x-diff
Expires: Mon, Jul 28, 7:43 PM (1 w, 3 d ago)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 187436
Default Alt Text: (5 KB)

No OneTemporary
Actions

View Options

File Metadata

Event Timeline

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions