Sfoglia il codice sorgente

Merge pull request #225 from ares333/master

bug fix
walkor 8 anni fa
parent
commit
3dd7124bf5
1 ha cambiato i file con 3 aggiunte e 2 eliminazioni
  1. 3 2
      Worker.php

+ 3 - 2
Worker.php

@@ -767,7 +767,6 @@ class Worker
                     $sig = SIGUSR1;
                 }
                 posix_kill($master_pid, $sig);
-                self::log("Workerman[$start_file] reload");
                 exit;
             default :
                 exit($usage);
@@ -1330,7 +1329,9 @@ class Worker
             // Send reload signal to a worker process.
             posix_kill($one_worker_pid, $sig);
             // If the process does not exit after self::KILL_WORKER_TIMER_TIME seconds try to kill it.
-            Timer::add(self::KILL_WORKER_TIMER_TIME, 'posix_kill', array($one_worker_pid, SIGKILL), false);
+            if(!self::$_gracefulStop){
+                Timer::add(self::KILL_WORKER_TIMER_TIME, 'posix_kill', array($one_worker_pid, SIGKILL), false);
+            }
         } // For child processes.
         else {
             reset(self::$_workers);