Server->Workerman

bin/workermand

@@ -35,7 +35,7 @@ require_once WORKERMAN_ROOT_DIR . 'man/Core/Lib/Config.php';
 Man\Core\Lib\Config::instance();
 if(!($pid_file = Man\Core\Lib\Config::get('workerman.pid_file')))
 {
-    $pid_file = '/var/run/php-server.pid';
+    $pid_file = '/var/run/workerman.pid';
 }
 define('WORKERMAN_PID_FILE', $pid_file);
 
@@ -70,10 +70,10 @@ if($cmd != 'status' && is_file(WORKERMAN_PID_FILE))
         {
             if(($start_pwuid = posix_getpwuid($stat['uid'])) && ($current_pwuid = posix_getpwuid(posix_getuid())))
             {
-                exit("\n\033[31;40mServer is started by user {$start_pwuid['name']}, {$current_pwuid['name']} can not $cmd Server, Permission denied\033[0m\n\n\033[31;40mServer $cmd failed\033[0m\n\n");
+                exit("\n\033[31;40mWorkerman is started by user {$start_pwuid['name']}, {$current_pwuid['name']} can not $cmd Workerman, Permission denied\033[0m\n\n\033[31;40mWorkerman $cmd failed\033[0m\n\n");
             }
         }
-        exit("Can not $cmd Server, Permission denied\n");
+        exit("Can not $cmd Workerman, Permission denied\n");
     }
     //检查pid进程是否存在
     if($pid = @file_get_contents(WORKERMAN_PID_FILE))
@@ -82,7 +82,7 @@ if($cmd != 'status' && is_file(WORKERMAN_PID_FILE))
         {
             if(!unlink(WORKERMAN_PID_FILE))
             {
-                exit("Can not $cmd Server\n\n");
+                exit("Can not $cmd Workerman\n\n");
             }
         }
     }
@@ -98,7 +98,7 @@ switch($cmd)
         $pid = @file_get_contents(WORKERMAN_PID_FILE);
         if(empty($pid))
         {
-            exit("Server not running?\n");
+            exit("Workerman not running?\n");
         }
         stop_and_wait();
         break;
@@ -114,7 +114,7 @@ switch($cmd)
             exit("server not running?\n");
         }
         posix_kill($pid, SIGHUP);
-        echo "reload PHP-Server\n";
+        echo "reload Workerman\n";
         break;
     case 'kill':
         force_kill();
@@ -125,7 +125,7 @@ switch($cmd)
         $sock = @stream_socket_client($address);
         if(!$sock)
         {
-            exit("\n\033[31;40mcan not connect to $address \033[0m\n\n\033[31;40mServer not running\033[0m\n\n");
+            exit("\n\033[31;40mcan not connect to $address \033[0m\n\n\033[31;40mWorkerman not running\033[0m\n\n");
         }
         fwrite($sock, 'status');
         $read_fds = array($sock);
@@ -195,7 +195,7 @@ function stop_and_wait($wait_time = 6)
                 break;
             }
         }
-        echo "PHP-Server stoped\n";
+        echo "Workerman stoped\n";
     }
 }
 

man/Core/Lib/Checker.php

@@ -45,8 +45,8 @@ class Checker
             $suport = extension_loaded($ext_name);
             if($must_required && !$suport)
             {
-                \Man\Core\Master::notice($ext_name. " [NOT SUPORT BUT REQUIRED] \tYou have to compile CLI version of PHP with --enable-{$ext_name} \tServer start fail");
-                exit($ext_name. " \033[31;40m [NOT SUPORT BUT REQUIRED] \033[0m\n\n\033[31;40mYou have to compile CLI version of PHP with --enable-{$ext_name} \033[0m\n\n\033[31;40mServer start fail\033[0m\n\n");
+                \Man\Core\Master::notice($ext_name. " [NOT SUPORT BUT REQUIRED] \tYou have to compile CLI version of PHP with --enable-{$ext_name} \tWorkerman start fail");
+                exit($ext_name. " \033[31;40m [NOT SUPORT BUT REQUIRED] \033[0m\n\n\033[31;40mYou have to compile CLI version of PHP with --enable-{$ext_name} \033[0m\n\n\033[31;40mWorkerman start fail\033[0m\n\n");
             }
     
             // 支持扩展
@@ -88,8 +88,8 @@ class Checker
         {
             if(isset($disable_func_map[$func]))
             {
-                \Man\Core\Master::notice("Function $func may be disabled\tPlease check disable_functions in php.ini \t Server start fail");
-                exit("\n\033[31;40mFunction $func may be disabled\nPlease check disable_functions in php.ini\033[0m\n\n\033[31;40mServer start fail\033[0m\n\n");
+                \Man\Core\Master::notice("Function $func may be disabled\tPlease check disable_functions in php.ini \t Workerman start fail");
+                exit("\n\033[31;40mFunction $func may be disabled\nPlease check disable_functions in php.ini\033[0m\n\n\033[31;40mWorkerman start fail\033[0m\n\n");
             }
         }
     }
@@ -108,8 +108,8 @@ class Checker
         {
             if(empty($config['start_workers']))
             {
-                \Man\Core\Master::notice(str_pad($worker_name, $pad_length)." [start_workers not set]\tServer start fail");
-                exit(str_pad($worker_name, $pad_length)."\033[31;40m [start_workers not set]\033[0m\n\n\033[31;40mServer start fail\033[0m\n");
+                \Man\Core\Master::notice(str_pad($worker_name, $pad_length)." [start_workers not set]\tWorkerman start fail");
+                exit(str_pad($worker_name, $pad_length)."\033[31;40m [start_workers not set]\033[0m\n\n\033[31;40mWorkerman start fail\033[0m\n");
             }
     
             $total_worker_count += $config['start_workers'];
@@ -138,8 +138,8 @@ class Checker
                 if(!self::checkWorkerUserName($worker_user))
                 {
                     echo str_pad($worker_name, $pad_length),"\033[31;40m [FAIL] \033[0m\n";
-                    \Man\Core\Master::notice("Can not run $worker_name processes as user $worker_user , User $worker_user not exists\tServer start fail");
-                    exit("\n\033[31;40mCan not run $worker_name processes as user $worker_user , User $worker_user not exists\033[0m\n\n\033[31;40mServer start fail\033[0m\n\n");
+                    \Man\Core\Master::notice("Can not run $worker_name processes as user $worker_user , User $worker_user not exists\tWorkerman start fail");
+                    exit("\n\033[31;40mCan not run $worker_name processes as user $worker_user , User $worker_user not exists\033[0m\n\n\033[31;40mWorkerman start fail\033[0m\n\n");
                 }
             }
             
@@ -148,8 +148,8 @@ class Checker
     
         if($total_worker_count > \Man\Core\Master::SERVER_MAX_WORKER_COUNT)
         {
-            \Man\Core\Master::notice("Number of worker processes can not be more than " . \Man\Core\Master::SERVER_MAX_WORKER_COUNT . ".\tPlease check start_workers in " . WORKERMAN_ROOT_DIR . "config/main.php\tServer start fail");
-            exit("\n\033[31;40mNumber of worker processes can not be more than " . \Man\Core\Master::SERVER_MAX_WORKER_COUNT . ".\nPlease check start_workers in " . WORKERMAN_ROOT_DIR . "config/main.php\033[0m\n\n\033[31;40mServer start fail\033[0m\n");
+            \Man\Core\Master::notice("Number of worker processes can not be more than " . \Man\Core\Master::SERVER_MAX_WORKER_COUNT . ".\tPlease check start_workers in " . WORKERMAN_ROOT_DIR . "config/main.php\tWorkerman start fail");
+            exit("\n\033[31;40mNumber of worker processes can not be more than " . \Man\Core\Master::SERVER_MAX_WORKER_COUNT . ".\nPlease check start_workers in " . WORKERMAN_ROOT_DIR . "config/main.php\033[0m\n\n\033[31;40mWorkerman start fail\033[0m\n");
         }
     
         echo "-------------------------------------------------\n";
@@ -211,13 +211,13 @@ class Checker
         // 已经有进程pid可能server已经启动
         if(@file_get_contents(WORKERMAN_PID_FILE))
         {
-            \Man\Core\Master::notice("Server already started", true);
+            \Man\Core\Master::notice("Workerman already started", true);
             exit;
         }
         
         if(is_dir(WORKERMAN_PID_FILE))
         {
-            exit("\n\033[31;40mpid-file ".WORKERMAN_PID_FILE." is Directory\033[0m\n\n\033[31;40mServer start failed\033[0m\n\n");
+            exit("\n\033[31;40mpid-file ".WORKERMAN_PID_FILE." is Directory\033[0m\n\n\033[31;40mWorkerman start failed\033[0m\n\n");
         }
         
         $pid_dir = dirname(WORKERMAN_PID_FILE);
@@ -231,7 +231,7 @@ class Checker
         
         if(!is_writeable($pid_dir))
         {
-            exit("\n\033[31;40mYou should start the server as root\033[0m\n\n\033[31;40mServer start failed\033[0m\n\n");
+            exit("\n\033[31;40mYou should start the server as root\033[0m\n\n\033[31;40mWorkerman start failed\033[0m\n\n");
         }
     }
 }

man/Core/Lib/Log.php

@@ -50,8 +50,8 @@ class Log
         if(!$ok)
         {
             $pad_length = 26;
-            Master::notice(WORKERMAN_LOG_DIR." Need to have read and write permissions\tServer start fail");
-            exit("------------------------LOG------------------------\n".str_pad(WORKERMAN_LOG_DIR, $pad_length) . "\033[31;40m [NOT READABLE/WRITEABLE] \033[0m\n\n\033[31;40mDirectory ".WORKERMAN_LOG_DIR." Need to have read and write permissions\033[0m\n\n\033[31;40mServer start fail\033[0m\n\n");
+            Master::notice(WORKERMAN_LOG_DIR." Need to have read and write permissions\tWorkerman start fail");
+            exit("------------------------LOG------------------------\n".str_pad(WORKERMAN_LOG_DIR, $pad_length) . "\033[31;40m [NOT READABLE/WRITEABLE] \033[0m\n\n\033[31;40mDirectory ".WORKERMAN_LOG_DIR." Need to have read and write permissions\033[0m\n\n\033[31;40mWorkerman start fail\033[0m\n\n");
         }
     }
     

man/Core/Master.php

@@ -151,7 +151,7 @@ class Master
     public static function run()
     {
         // 输出信息
-        self::notice("Server is starting ...", true);
+        self::notice("Workerman is starting ...", true);
         // 初始化
         self::init();
         // 检查环境
@@ -167,7 +167,7 @@ class Master
         // 创建worker进程
         self::createWorkers();
         // 输出信息
-        self::notice("Server start success ...", true);
+        self::notice("Workerman start success ...", true);
         // 标记sever状态为运行中...
         self::$serverStatus = self::STATUS_RUNNING;
         // 关闭标准输出
@@ -279,7 +279,7 @@ class Master
         // 保存到文件中，用于实现停止、重启
         if(false === @file_put_contents(WORKERMAN_PID_FILE, self::$masterPid))
         {
-            exit("\033[31;40mCan not save pid to pid-file(" . WORKERMAN_PID_FILE . ")\033[0m\n\n\033[31;40mServer start fail\033[0m\n\n");
+            exit("\033[31;40mCan not save pid to pid-file(" . WORKERMAN_PID_FILE . ")\033[0m\n\n\033[31;40mWorkerman start fail\033[0m\n\n");
         }
         
         // 更改权限
@@ -313,8 +313,8 @@ class Master
                 self::$listenedSockets[$worker_name] = stream_socket_server($config['listen'], $error_no, $error_msg, $flags);
                 if(!self::$listenedSockets[$worker_name])
                 {
-                    Lib\Log::add("can not create socket {$config['listen']} info:{$error_no} {$error_msg}\tServer start fail");
-                    exit("\n\033[31;40mcan not create socket {{$config['listen']} info:{$error_no} {$error_msg}\033[0m\n\n\033[31;40mServer start fail\033[0m\n\n");
+                    Lib\Log::add("can not create socket {$config['listen']} info:{$error_no} {$error_msg}\tWorkerman start fail");
+                    exit("\n\033[31;40mcan not create socket {{$config['listen']} info:{$error_no} {$error_msg}\033[0m\n\n\033[31;40mWorkerman start fail\033[0m\n\n");
                 }
             }
         }
@@ -445,7 +445,7 @@ class Master
         pcntl_signal(SIGINT,  array('\Man\Core\Master', 'signalHandler'), false);
         // 设置SIGUSR1信号处理函数,测试用
         pcntl_signal(SIGUSR1, array('\Man\Core\Master', 'signalHandler'), false);
-        // 设置SIGUSR2信号处理函数,平滑重启Server
+        // 设置SIGUSR2信号处理函数,平滑重启Workerman
         pcntl_signal(SIGHUP, array('\Man\Core\Master', 'signalHandler'), false);
         // 设置子进程退出信号处理函数
         pcntl_signal(SIGCHLD, array('\Man\Core\Master', 'signalHandler'), false);
@@ -488,7 +488,7 @@ class Master
         {
             // 停止server信号
             case SIGINT:
-                self::notice("Server is shutting down");
+                self::notice("Workerman is shutting down");
                 self::stop();
                 break;
             // 测试用
@@ -502,7 +502,7 @@ class Master
             // 平滑重启server信号
             case SIGHUP:
                 Lib\Config::reload();
-                self::notice("Server reloading");
+                self::notice("Workerman reloading");
                 self::addToRestartWorkers(array_keys(self::getPidWorkerNameMap()));
                 self::restartWorkers();
                 break;
@@ -578,7 +578,7 @@ class Master
                 // 没有子进程了,可能是出现Fatal Err 了
                 if(pcntl_get_last_error() == 10)
                 {
-                    self::notice('Server has no workers now');
+                    self::notice('Workerman has no workers now');
                 }
                 return -1;
             }
@@ -621,7 +621,7 @@ class Master
                     // 删除共享内存
                     self::removeShmAndQueue();
                     // 发送提示
-                    self::notice("Server stoped");
+                    self::notice("Workerman stoped");
                     // 删除pid文件
                     @unlink(WORKERMAN_PID_FILE);
                     exit(0);
@@ -881,7 +881,7 @@ class Master
         // >=php 5.5
         if (version_compare(phpversion(), "5.5", "ge") && function_exists('cli_set_process_title'))
         {
-            cli_set_process_title($title);
+            @cli_set_process_title($title);
         }
         // 需要扩展
         elseif(extension_loaded('proctitle') && function_exists('setproctitle'))
@@ -898,7 +898,7 @@ class Master
      */
     public static function notice($msg, $display = false)
     {
-        Lib\Log::add("Server:".$msg);
+        Lib\Log::add("Workerman:".$msg);
         if($display)
         {
             if(self::$serverStatus == self::STATUS_STARTING)