Page MenuHomePhabricator
Files F15420464

D17550.id42212.diff
No OneTemporary
Actions

D17550.id42212.diff
View Options

diff --git a/src/applications/daemon/controller/PhabricatorDaemonLogViewController.php b/src/applications/daemon/controller/PhabricatorDaemonLogViewController.php
--- a/src/applications/daemon/controller/PhabricatorDaemonLogViewController.php
+++ b/src/applications/daemon/controller/PhabricatorDaemonLogViewController.php
@@ -125,12 +125,10 @@
case PhabricatorDaemonLog::STATUS_WAIT:
$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 (%s) to resume '.
- 'processing. After encountering an error, daemons wait before '.
- 'resuming work to avoid overloading services.',
- phutil_format_relative_time($unknown_time),
- phutil_format_relative_time($wait_time));
+ 'recently (within %s). The process is currently waiting to '.
+ 'restart, either because it is hibernating or because it '.
+ 'encountered an error.',
+ phutil_format_relative_time($unknown_time));
break;
case PhabricatorDaemonLog::STATUS_EXITING:
$details = pht('This daemon is shutting down gracefully.');
diff --git a/src/infrastructure/daemon/overseer/PhabricatorDaemonOverseerModule.php b/src/infrastructure/daemon/overseer/PhabricatorDaemonOverseerModule.php
--- a/src/infrastructure/daemon/overseer/PhabricatorDaemonOverseerModule.php
+++ b/src/infrastructure/daemon/overseer/PhabricatorDaemonOverseerModule.php
@@ -48,6 +48,12 @@
$this->configVersion = $new_version;
+ // Don't trigger a reload if we're loading the config for the very
+ // first time.
+ if ($old_version === null) {
+ return false;
+ }
+
return ($old_version != $new_version);
}

File Metadata

Mime Type
text/plain
Expires
Sat, Mar 22, 2:10 PM (2 w, 2 h ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
7717101
Default Alt Text
D17550.id42212.diff (1 KB)

Event Timeline

Phabricator · Built by Phacility