Merge pull request #51 from xudianyang/master

* 调整processType标识

Author: xudianyang

src/MSFServer.php

@@ -122,7 +122,7 @@ public function beforeSwooleStart()
             } else {
                 $reloadProcess = new \swoole_process(function ($process) {
                     new Inotify($this->config, $this);
-                    $this->onWorkerStart($this->server, 0);
+                    $this->onWorkerStart($this->server, null);
                 }, false, 2);
                 $this->server->addProcess($reloadProcess);
             }
@@ -132,7 +132,7 @@ public function beforeSwooleStart()
         if ($this->config->get('config_manage_enable', false)) {
             $configProcess = new \swoole_process(function ($process) {
                 new Config($this->config, $this);
-                $this->onWorkerStart($this->server, 0);
+                $this->onWorkerStart($this->server, null);
             }, false, 2);
             $this->server->addProcess($configProcess);
         }
@@ -141,7 +141,7 @@ public function beforeSwooleStart()
         if ($this->config->get('user_timer_enable', false)) {
             $timerProcess = new \swoole_process(function ($process) {
                 new Timer($this->config, $this);
-                $this->onWorkerStart($this->server, 0);
+                $this->onWorkerStart($this->server, null);
             }, false, 2);
             $this->server->addProcess($timerProcess);
         }
@@ -476,7 +476,8 @@ public function onWorkerStart($serv, $workerId)
     {
         // Worker类型
         if (!$this->isTaskWorker()) {
-            if ($this->processType == Marco::PROCESS_WORKER) {
+            if ($workerId !== null) {
+                $this->processType = Marco::PROCESS_WORKER;
                 getInstance()->sysTimers[] = swoole_timer_tick(2000, function ($timerId) {
                     $this->statistics();
                 });

src/Marco.php

@@ -109,6 +109,16 @@ class Marco
      */
     const PROCESS_TIMER                             = 5;
 
+    /**
+     * 进程为MASTER
+     */
+    const PROCESS_MASTER                            = 4094;
+
+    /**
+     * 进程为MANAGER
+     */
+    const PROCESS_MANAGER                           = 4095;
+
     /**
      * 进程为USER（默认）
      */
@@ -118,12 +128,14 @@ class Marco
      * 进程名称
      */
     const PROCESS_NAME                              = [
-        self::PROCESS_WORKER                        => 'WORKER',
-        self::PROCESS_TASKER                        => 'TASKER',
-        self::PROCESS_RELOAD                        => 'RELOAD',
-        self::PROCESS_CONFIG                        => 'CONFIG',
-        self::PROCESS_TIMER                         => 'TIMER',
-        self::PROCESS_USER                          => 'USER',
+        self::PROCESS_MASTER                        => 'Master',
+        self::PROCESS_MANAGER                       => 'Manager',
+        self::PROCESS_WORKER                        => 'Worker',
+        self::PROCESS_TASKER                        => 'Tasker',
+        self::PROCESS_RELOAD                        => 'Reload',
+        self::PROCESS_CONFIG                        => 'Config',
+        self::PROCESS_TIMER                         => 'Timer',
+        self::PROCESS_USER                          => 'User',
     ];
 
     /**

src/Server.php

@@ -40,7 +40,7 @@ abstract class Server extends Child
     /**
      * @var int 进程类型
      */
-    public $processType = Marco::PROCESS_WORKER;
+    public $processType = Marco::PROCESS_MASTER;
 
     /**
      * @var Server 实例
@@ -532,9 +532,10 @@ public function beforeSwooleStart()
     public function onStart($serv)
     {
         self::$_masterPid = $serv->master_pid;
+        $this->processType = Marco::PROCESS_MASTER;
         file_put_contents(self::$pidFile, self::$_masterPid);
         file_put_contents(self::$pidFile, ',' . $serv->manager_pid, FILE_APPEND);
-        self::setProcessTitle($this->config['server.process_title'] . '-Master');
+        self::setProcessTitle($this->config['server.process_title'] . '-' . Marco::PROCESS_NAME[$this->processType]);
     }
 
     /**
@@ -647,7 +648,8 @@ public function onWorkerError($serv, $workerId, $workerPid, $exitCode)
      */
     public function onManagerStart($serv)
     {
-        self::setProcessTitle($this->config['server.process_title'] . '-Manager');
+        $this->processType = Marco::PROCESS_MANAGER;
+        self::setProcessTitle($this->config['server.process_title'] . '-' . Marco::PROCESS_NAME[$this->processType]);
     }
 
     /**