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

xtrime-ru · Nov 28, 2020 · 0323493 · 0323493
1 parent 769d39a
commit 0323493
Showing 1 changed file with 17 additions and 4 deletions.
diff --git a/src/Server/HealthCheck.php b/src/Server/HealthCheck.php
@@ -37,9 +37,11 @@ public static function start(int $parentPid): void
         static::$requestTimeout = (int) Config::getInstance()->get('health_check.timeout');
 
         try {
-            Loop::delay(static::$checkInterval*1000, function() {
+            Loop::repeat(static::$checkInterval*1000, function() use($parentPid){
                 Logger::getInstance()->info('Start health check');
-
+                if (!self::isProcessAlive($parentPid)) {
+                    throw new RuntimeException('Parent process died');
+                }
                 $sessions = yield from static::getSessionList();
                 $sessionsForCheck = static::getLoggedInSessions($sessions);
                 $promises = [];
@@ -54,10 +56,15 @@ public static function start(int $parentPid): void
             Loop::run();
         } catch (\Throwable $e) {
             Logger::getInstance()->error($e->getMessage());
-            Logger::getInstance()->critical('Health check failed. Killing parent process');
-            exec("kill -9 $parentPid");
+            Logger::getInstance()->critical('Health check failed');
+            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()
@@ -112,4 +119,10 @@ private static function sendRequest(string $url): Promise
             return yield $response->getBody()->buffer();
         });
     }
+
+    private static function isProcessAlive(int $pid): bool
+    {
+        $result = exec("ps -p $pid | grep $pid");
+        return !empty($result);
+    }
 }