eee

Abstracts/HotReload.php

@@ -139,17 +139,92 @@ class HotReload extends AbstractProcess
 
     private function getMasterPid(): ?int
     {
+        $processes = $this->listProcesses();
+        $candidates = [];
+
         $pidFile = function_exists('storage') ? storage('.swoole.pid') : '';
-        if (!is_file($pidFile)) {
-            return null;
+        if (is_file($pidFile)) {
+            $candidates[] = (int)trim((string)file_get_contents($pidFile));
         }
 
-        $pid = (int)trim((string)file_get_contents($pidFile));
-        if ($pid <= 1 || !Process::kill($pid, 0)) {
-            return null;
+        foreach ($processes as $process) {
+            if ($this->isMasterProcessCommand($process['command'])) {
+                $candidates[] = (int)$process['pid'];
+            }
         }
 
-        return $pid;
+        foreach (array_values(array_unique(array_filter($candidates))) as $pid) {
+            if ($this->isProcessAlive($pid) && $this->isMasterPid($pid, $processes)) {
+                return $pid;
+            }
+        }
+
+        return null;
+    }
+
+    private function isMasterPid(int $pid, array $processes): bool
+    {
+        foreach ($processes as $process) {
+            if ((int)$process['pid'] === $pid) {
+                return $this->isMasterProcessCommand($process['command']) && $this->isSameAppProcess($pid);
+            }
+        }
+
+        return false;
+    }
+
+    private function isMasterProcessCommand(string $command): bool
+    {
+        $prefix = '[' . config('site.id', 'system-service') . '].Master[';
+        return str_contains($command, $prefix);
+    }
+
+    private function isSameAppProcess(int $pid): bool
+    {
+        $cwd = @readlink('/proc/' . $pid . '/cwd');
+        if ($cwd === false || $cwd === '') {
+            return false;
+        }
+
+        return $this->normalizePath($cwd) === $this->normalizePath(APP_PATH);
+    }
+
+    private function normalizePath(string $path): string
+    {
+        $real = realpath($path) ?: $path;
+        return rtrim(str_replace('\\', '/', $real), '/');
+    }
+
+    private function listProcesses(): array
+    {
+        $lines = [];
+        exec('ps -eo pid=,ppid=,args=', $lines);
+
+        $processes = [];
+        foreach ($lines as $line) {
+            $line = trim($line);
+            if ($line === '') {
+                continue;
+            }
+
+            $parts = preg_split('/\s+/', $line, 3);
+            if (count($parts) < 3) {
+                continue;
+            }
+
+            $processes[] = [
+                'pid' => (int)$parts[0],
+                'ppid' => (int)$parts[1],
+                'command' => $parts[2],
+            ];
+        }
+
+        return $processes;
+    }
+
+    private function isProcessAlive(int $pid): bool
+    {
+        return $pid > 1 && @Process::kill($pid, 0);
     }
     protected function addListen(): void
     {