From df3f4d5a40c785a20a0ee69ba82ce9ae0ac80579 Mon Sep 17 00:00:00 2001 From: epriestley Date: Tue, 23 Jul 2013 12:11:20 -0700 Subject: [PATCH] Show wait delay in daemon UI explicitly Summary: Ref T3557. I had misremembered this value; show it in the UI. Depends on D6542. Test Plan: Viewed UI for a waiting daemon. Saw it restart after 5s. Reviewers: btrahan Reviewed By: btrahan CC: aran Maniphest Tasks: T3557 Differential Revision: https://secure.phabricator.com/D6543 --- .../controller/PhabricatorDaemonLogViewController.php | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/applications/daemon/controller/PhabricatorDaemonLogViewController.php b/src/applications/daemon/controller/PhabricatorDaemonLogViewController.php index 1138172cfa..e62471357c 100644 --- a/src/applications/daemon/controller/PhabricatorDaemonLogViewController.php +++ b/src/applications/daemon/controller/PhabricatorDaemonLogViewController.php @@ -93,6 +93,7 @@ final class PhabricatorDaemonLogViewController $unknown_time = PhabricatorDaemonLogQuery::getTimeUntilUnknown(); $dead_time = PhabricatorDaemonLogQuery::getTimeUntilDead(); + $wait_time = PhutilDaemonOverseer::RESTART_WAIT; $details = null; $status = $daemon->getStatus(); @@ -122,10 +123,11 @@ final class PhabricatorDaemonLogViewController $details = pht( 'This daemon is running normally and reported a status update '. 'recently (within %s). However, it encountered an error while '. - 'doing work and is waiting a little while to resume processing. '. - 'After encountering an error, daemons wait before resuming work '. - 'to avoid overloading services.', - phabricator_format_relative_time($unknown_time)); + 'doing work and is waiting a little while (%s) to resume '. + 'processing. After encountering an error, daemons wait before '. + 'resuming work to avoid overloading services.', + phabricator_format_relative_time($unknown_time), + phabricator_format_relative_time($wait_time)); break; case PhabricatorDaemonLog::STATUS_EXITED: $details = pht(