From bc28b2c3a809ab80f2fd9c1653886ab8efc653ba Mon Sep 17 00:00:00 2001 From: epriestley Date: Sun, 15 Mar 2015 11:31:07 -0700 Subject: [PATCH] Examine fewer daemons for variant config Summary: Right now, if a daemon dies it can leave the setup warning around for like 10 minutes or something until we reap it. Tighten the warning so we only care about actively running daemons. Test Plan: Checked setup issues. Reviewers: btrahan Reviewed By: btrahan Subscribers: epriestley Differential Revision: https://secure.phabricator.com/D12088 --- .../config/check/PhabricatorDaemonsSetupCheck.php | 2 +- src/applications/daemon/query/PhabricatorDaemonLogQuery.php | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/applications/config/check/PhabricatorDaemonsSetupCheck.php b/src/applications/config/check/PhabricatorDaemonsSetupCheck.php index 52f4fe2f37..a6b9ef8488 100644 --- a/src/applications/config/check/PhabricatorDaemonsSetupCheck.php +++ b/src/applications/config/check/PhabricatorDaemonsSetupCheck.php @@ -10,7 +10,7 @@ final class PhabricatorDaemonsSetupCheck extends PhabricatorSetupCheck { $task_daemon = id(new PhabricatorDaemonLogQuery()) ->setViewer(PhabricatorUser::getOmnipotentUser()) - ->withStatus(PhabricatorDaemonLogQuery::STATUS_ALIVE) + ->withStatus(PhabricatorDaemonLogQuery::STATUS_RUNNING) ->withDaemonClasses(array('PhabricatorTaskmasterDaemon')) ->setLimit(1) ->execute(); diff --git a/src/applications/daemon/query/PhabricatorDaemonLogQuery.php b/src/applications/daemon/query/PhabricatorDaemonLogQuery.php index 58e76e3462..545c412f86 100644 --- a/src/applications/daemon/query/PhabricatorDaemonLogQuery.php +++ b/src/applications/daemon/query/PhabricatorDaemonLogQuery.php @@ -5,6 +5,7 @@ final class PhabricatorDaemonLogQuery const STATUS_ALL = 'status-all'; const STATUS_ALIVE = 'status-alive'; + const STATUS_RUNNING = 'status-running'; private $ids; private $notIDs; @@ -170,6 +171,10 @@ final class PhabricatorDaemonLogQuery switch ($status) { case self::STATUS_ALL: return array(); + case self::STATUS_RUNNING: + return array( + PhabricatorDaemonLog::STATUS_RUNNING, + ); case self::STATUS_ALIVE: return array( PhabricatorDaemonLog::STATUS_UNKNOWN,