danog/TelegramApiServer
1
0
Fork 0
mirror of https://github.com/danog/TelegramApiServer.git synced 2024-12-02 09:17:46 +01:00
Code Issues Projects Releases Wiki Activity

Fix critical bug in healthcheck. Use repeat instead of delay.

Browse Source
This commit is contained in:
Alexander Pankratov 2020-11-29 01:23:01 +03:00
parent 769d39afcd
commit 032349387f
1 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/Server/HealthCheck.php
View File

@ -37,9 +37,11 @@ class HealthCheck
static::$requestTimeout = (int) Config::getInstance()->get('health_check.timeout'); static::$requestTimeout = (int) Config::getInstance()->get('health_check.timeout');
try { try {
Loop::delay(static::$checkInterval*1000, function() { Loop::repeat(static::$checkInterval*1000, function() use($parentPid){
Logger::getInstance()->info('Start health check'); Logger::getInstance()->info('Start health check');
if (!self::isProcessAlive($parentPid)) {
throw new RuntimeException('Parent process died');
}
$sessions = yield from static::getSessionList(); $sessions = yield from static::getSessionList();
$sessionsForCheck = static::getLoggedInSessions($sessions); $sessionsForCheck = static::getLoggedInSessions($sessions);
$promises = []; $promises = [];
@ -54,10 +56,15 @@ class HealthCheck
Loop::run(); Loop::run();
} catch (\Throwable $e) { } catch (\Throwable $e) {
Logger::getInstance()->error($e->getMessage()); Logger::getInstance()->error($e->getMessage());
Logger::getInstance()->critical('Health check failed. Killing parent process'); Logger::getInstance()->critical('Health check failed');
exec("kill -9 $parentPid"); if (self::isProcessAlive($parentPid)) {
Logger::getInstance()->critical('Killing parent process');
exec("kill -9 $parentPid");
}
} }
Logger::getInstance()->critical('Health check process exit');
} }
private static function getSessionList() private static function getSessionList()
@ -112,4 +119,10 @@ class HealthCheck
return yield $response->getBody()->buffer(); return yield $response->getBody()->buffer();
}); });
} }
private static function isProcessAlive(int $pid): bool
{
$result = exec("ps -p $pid | grep $pid");
return !empty($result);
}
} }