Fix leak and test in 4.4 (#3674)

* Fix leak * Fix test
swoole · Sep 18, 2020 · a10d844 · a10d844
1 parent 24751f4
commit a10d844
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 1 deletion.
diff --git a/src/server/master.cc b/src/server/master.cc
@@ -1735,6 +1735,10 @@ static void swServer_signal_handler(int sig)
     swTraceLog(SW_TRACE_SERVER, "signal[%d] %s triggered in %d", sig, swSignal_str(sig), getpid());
 
     swServer *serv = SwooleG.serv;
+    if (!SwooleG.running or !serv) {
+        return;
+    }
+
     int status;
     pid_t pid;
     switch (sig)

diff --git a/tests/include/lib/src/DbWrapper.php b/tests/include/lib/src/DbWrapper.php
@@ -2,6 +2,7 @@
 
 namespace SwooleTest;
 
+use RuntimeException;
 use Swoole\Coroutine\MySQL;
 
 class DbWrapper

diff --git a/tests/include/lib/src/ProcessManager.php b/tests/include/lib/src/ProcessManager.php
@@ -249,7 +249,7 @@ public function run($redirectStdout = false)
         $waitInfo = Swoole\Process::wait(true);
         $this->childStatus = $waitInfo['code'];
         if (!in_array($waitInfo['signal'], $this->expectExitSignal)) {
-            throw new RuntimeException("Unexpected exit code {$waitInfo['signal']}");
+            throw new \RuntimeException("Unexpected exit code {$waitInfo['signal']}");
         }
 
         return true;