@recaptime-dev's working patches + fork for Phorge, a community fork of Phabricator. (Upstream dev and stable branches are at upstream/main and upstream/stable respectively.)
hq.recaptime.dev/wiki/Phorge
phorge
phabricator
Update Phabricator for DaemonOverseer vs DaemonHandle split
Summary: Ref T7352. A couple of the APIs changed slightly with D11851.
Test Plan: See D11851.
Reviewers: btrahan
Reviewed By: btrahan
Subscribers: epriestley
Maniphest Tasks: T7352
Differential Revision: https://secure.phabricator.com/D11852
+15
-14
+2
-1
src/applications/daemon/controller/PhabricatorDaemonConsoleController.php
+2
-1
src/applications/daemon/controller/PhabricatorDaemonConsoleController.php
···
57
57
if ($failed) {
58
58
// Add the time it takes to restart the daemons. This includes a guess
59
59
// about other overhead of 2X.
60
-
$usage_total += PhutilDaemonOverseer::RESTART_WAIT * count($failed) * 2;
60
+
$restart_delay = PhutilDaemonHandle::getWaitBeforeRestart();
61
+
$usage_total += $restart_delay * count($failed) * 2;
61
62
foreach ($failed as $failed_task) {
62
63
$usage_start = min($usage_start, $failed_task->getFailureTime());
63
64
}
+1
-1
src/applications/daemon/controller/PhabricatorDaemonLogViewController.php
+1
-1
src/applications/daemon/controller/PhabricatorDaemonLogViewController.php
···
112
112
113
113
$unknown_time = PhabricatorDaemonLogQuery::getTimeUntilUnknown();
114
114
$dead_time = PhabricatorDaemonLogQuery::getTimeUntilDead();
115
-
$wait_time = PhutilDaemonOverseer::RESTART_WAIT;
115
+
$wait_time = PhutilDaemonHandle::getWaitBeforeRestart();
116
116
117
117
$details = null;
118
118
$status = $daemon->getStatus();
+10
-10
src/applications/daemon/event/PhabricatorDaemonEventListener.php
+10
-10
src/applications/daemon/event/PhabricatorDaemonEventListener.php
···
5
5
private $daemons = array();
6
6
7
7
public function register() {
8
-
$this->listen(PhutilDaemonOverseer::EVENT_DID_LAUNCH);
9
-
$this->listen(PhutilDaemonOverseer::EVENT_DID_LOG);
10
-
$this->listen(PhutilDaemonOverseer::EVENT_DID_HEARTBEAT);
11
-
$this->listen(PhutilDaemonOverseer::EVENT_WILL_GRACEFUL);
12
-
$this->listen(PhutilDaemonOverseer::EVENT_WILL_EXIT);
8
+
$this->listen(PhutilDaemonHandle::EVENT_DID_LAUNCH);
9
+
$this->listen(PhutilDaemonHandle::EVENT_DID_LOG);
10
+
$this->listen(PhutilDaemonHandle::EVENT_DID_HEARTBEAT);
11
+
$this->listen(PhutilDaemonHandle::EVENT_WILL_GRACEFUL);
12
+
$this->listen(PhutilDaemonHandle::EVENT_WILL_EXIT);
13
13
}
14
14
15
15
public function handleEvent(PhutilEvent $event) {
16
16
switch ($event->getType()) {
17
-
case PhutilDaemonOverseer::EVENT_DID_LAUNCH:
17
+
case PhutilDaemonHandle::EVENT_DID_LAUNCH:
18
18
$this->handleLaunchEvent($event);
19
19
break;
20
-
case PhutilDaemonOverseer::EVENT_DID_HEARTBEAT:
20
+
case PhutilDaemonHandle::EVENT_DID_HEARTBEAT:
21
21
$this->handleHeartbeatEvent($event);
22
22
break;
23
-
case PhutilDaemonOverseer::EVENT_DID_LOG:
23
+
case PhutilDaemonHandle::EVENT_DID_LOG:
24
24
$this->handleLogEvent($event);
25
25
break;
26
-
case PhutilDaemonOverseer::EVENT_WILL_GRACEFUL:
26
+
case PhutilDaemonHandle::EVENT_WILL_GRACEFUL:
27
27
$this->handleGracefulEvent($event);
28
28
break;
29
-
case PhutilDaemonOverseer::EVENT_WILL_EXIT:
29
+
case PhutilDaemonHandle::EVENT_WILL_EXIT:
30
30
$this->handleExitEvent($event);
31
31
break;
32
32
}
+2
-2
src/applications/daemon/query/PhabricatorDaemonLogQuery.php
+2
-2
src/applications/daemon/query/PhabricatorDaemonLogQuery.php
···
13
13
private $allowStatusWrites;
14
14
15
15
public static function getTimeUntilUnknown() {
16
-
return 3 * PhutilDaemonOverseer::HEARTBEAT_WAIT;
16
+
return 3 * PhutilDaemonHandle::getHeartbeatEventFrequency();
17
17
}
18
18
19
19
public static function getTimeUntilDead() {
20
-
return 30 * PhutilDaemonOverseer::HEARTBEAT_WAIT;
20
+
return 30 * PhutilDaemonHandle::getHeartbeatEventFrequency();
21
21
}
22
22
23
23
public function withIDs(array $ids) {