revi-archive/phorge-phorge
1
0
Fork 0
mirror of https://we.phorge.it/source/phorge.git synced 2025-01-02 19:01:03 +01:00
Code Issues Releases Wiki Activity

Show wait delay in daemon UI explicitly

Browse source 
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
This commit is contained in:
epriestley 2013-07-23 12:11:20 -07:00
parent 40226bbfd0
commit df3f4d5a40
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/applications/daemon/controller/PhabricatorDaemonLogViewController.php
View file

@ -93,6 +93,7 @@ final class PhabricatorDaemonLogViewController
$unknown_time = PhabricatorDaemonLogQuery::getTimeUntilUnknown(); $unknown_time = PhabricatorDaemonLogQuery::getTimeUntilUnknown();
$dead_time = PhabricatorDaemonLogQuery::getTimeUntilDead(); $dead_time = PhabricatorDaemonLogQuery::getTimeUntilDead();
$wait_time = PhutilDaemonOverseer::RESTART_WAIT;
$details = null; $details = null;
$status = $daemon->getStatus(); $status = $daemon->getStatus();
@ -122,10 +123,11 @@ final class PhabricatorDaemonLogViewController
$details = pht( $details = pht(
'This daemon is running normally and reported a status update '. 'This daemon is running normally and reported a status update '.
'recently (within %s). However, it encountered an error while '. 'recently (within %s). However, it encountered an error while '.
'doing work and is waiting a little while to resume processing. '. 'doing work and is waiting a little while (%s) to resume '.
'After encountering an error, daemons wait before resuming work '. 'processing. After encountering an error, daemons wait before '.
'to avoid overloading services.', 'resuming work to avoid overloading services.',
phabricator_format_relative_time($unknown_time)); phabricator_format_relative_time($unknown_time),
phabricator_format_relative_time($wait_time));
break; break;
case PhabricatorDaemonLog::STATUS_EXITED: case PhabricatorDaemonLog::STATUS_EXITED:
$details = pht( $details = pht(