zhamao-robot/zhamao-framework
1
0
Fork 0
mirror of https://github.com/zhamao-robot/zhamao-framework.git synced 2026-07-25 01:25:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

use accurate property name

Browse Source
This commit is contained in:
sunxyw
2022-04-11 22:35:10 +08:00
parent 0dd61a7270
commit f2aff5882d
1 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/ZM/Framework.php
View File

@@ -61,11 +61,11 @@ class Framework
public static $instant_mode = false; public static $instant_mode = false;
/** /**
* Swoole 配置 * Swoole 服务端配置
* *
* @var null|array * @var null|array
*/ */
private $swoole_config; private $swoole_server_config;
/** /**
* @var array * @var array
@@ -148,8 +148,8 @@ class Framework
date_default_timezone_set($timezone); date_default_timezone_set($timezone);
// 读取 Swoole 配置 // 读取 Swoole 配置
$this->swoole_config = ZMConfig::get('global', 'swoole'); $this->swoole_server_config = ZMConfig::get('global', 'swoole');
$this->swoole_config['log_level'] = SWOOLE_LOG_DEBUG; $this->swoole_server_config['log_level'] = SWOOLE_LOG_DEBUG;
// 是否启用远程终端 // 是否启用远程终端
$add_port = ZMConfig::get('global', 'remote_terminal')['status'] ?? false; $add_port = ZMConfig::get('global', 'remote_terminal')['status'] ?? false;
@@ -163,11 +163,11 @@ class Framework
$this->parseCliArgs(self::$argv, $add_port); $this->parseCliArgs(self::$argv, $add_port);
// 设置默认最长等待时间 // 设置默认最长等待时间
if (!isset($this->swoole_config['max_wait_time'])) { if (!isset($this->swoole_server_config['max_wait_time'])) {
$this->swoole_config['max_wait_time'] = 5; $this->swoole_server_config['max_wait_time'] = 5;
} }
// 设置最大 worker 进程数 // 设置最大 worker 进程数
$worker = $this->swoole_config['worker_num'] ?? swoole_cpu_num(); $worker = $this->swoole_server_config['worker_num'] ?? swoole_cpu_num();
define('ZM_WORKER_NUM', $worker); define('ZM_WORKER_NUM', $worker);
// 初始化原子计数器 // 初始化原子计数器
@@ -177,14 +177,14 @@ class Framework
if (!self::$argv['private-mode']) { if (!self::$argv['private-mode']) {
$out['working_dir'] = DataProvider::getWorkingDir(); $out['working_dir'] = DataProvider::getWorkingDir();
$out['listen'] = ZMConfig::get('global', 'host') . ':' . ZMConfig::get('global', 'port'); $out['listen'] = ZMConfig::get('global', 'host') . ':' . ZMConfig::get('global', 'port');
if (!isset($this->swoole_config['worker_num'])) { if (!isset($this->swoole_server_config['worker_num'])) {
if ((ZMConfig::get('global', 'runtime')['swoole_server_mode'] ?? SWOOLE_PROCESS) === SWOOLE_PROCESS) { if ((ZMConfig::get('global', 'runtime')['swoole_server_mode'] ?? SWOOLE_PROCESS) === SWOOLE_PROCESS) {
$out['worker'] = swoole_cpu_num() . ' (auto)'; $out['worker'] = swoole_cpu_num() . ' (auto)';
} else { } else {
$out['single_proc_mode'] = 'true'; $out['single_proc_mode'] = 'true';
} }
} else { } else {
$out['worker'] = $this->swoole_config['worker_num']; $out['worker'] = $this->swoole_server_config['worker_num'];
} }
$out['environment'] = ($args['env'] ?? null) === null ? 'default' : $args['env']; $out['environment'] = ($args['env'] ?? null) === null ? 'default' : $args['env'];
$out['log_level'] = Console::getLevel(); $out['log_level'] = Console::getLevel();
@@ -193,8 +193,8 @@ class Framework
if (APP_VERSION !== 'unknown') { if (APP_VERSION !== 'unknown') {
$out['app_version'] = APP_VERSION; $out['app_version'] = APP_VERSION;
} }
if (isset($this->swoole_config['task_worker_num'])) { if (isset($this->swoole_server_config['task_worker_num'])) {
$out['task_worker'] = $this->swoole_config['task_worker_num']; $out['task_worker'] = $this->swoole_server_config['task_worker_num'];
} }
if ((ZMConfig::get('global', 'sql_config')['sql_host'] ?? '') !== '') { if ((ZMConfig::get('global', 'sql_config')['sql_host'] ?? '') !== '') {
$conf = ZMConfig::get('global', 'sql_config'); $conf = ZMConfig::get('global', 'sql_config');
@@ -315,7 +315,7 @@ class Framework
} }
// 设置服务器配置 // 设置服务器配置
self::$server->set($this->swoole_config); self::$server->set($this->swoole_server_config);
Console::setServer(self::$server); Console::setServer(self::$server);
// 非静默模式下，打印欢迎信息 // 非静默模式下，打印欢迎信息
@@ -734,15 +734,15 @@ class Framework
switch ($x) { switch ($x) {
case 'worker-num': case 'worker-num':
if (intval($y) >= 1 && intval($y) <= 1024) { if (intval($y) >= 1 && intval($y) <= 1024) {
$this->swoole_config['worker_num'] = intval($y); $this->swoole_server_config['worker_num'] = intval($y);
} else { } else {
Console::warning(zm_internal_errcode('E00013') . 'Invalid worker num! Turn to default value (' . ($this->swoole_config['worker_num'] ?? swoole_cpu_num()) . ')'); Console::warning(zm_internal_errcode('E00013') . 'Invalid worker num! Turn to default value (' . ($this->swoole_server_config['worker_num'] ?? swoole_cpu_num()) . ')');
} }
break; break;
case 'task-worker-num': case 'task-worker-num':
if (intval($y) >= 1 && intval($y) <= 1024) { if (intval($y) >= 1 && intval($y) <= 1024) {
$this->swoole_config['task_worker_num'] = intval($y); $this->swoole_server_config['task_worker_num'] = intval($y);
$this->swoole_config['task_enable_coroutine'] = true; $this->swoole_server_config['task_enable_coroutine'] = true;
} else { } else {
Console::warning(zm_internal_errcode('E00013') . 'Invalid worker num! Turn to default value (0)'); Console::warning(zm_internal_errcode('E00013') . 'Invalid worker num! Turn to default value (0)');
} }
@@ -758,9 +758,9 @@ class Framework
echo "* You are in debug mode, do not use in production!\n"; echo "* You are in debug mode, do not use in production!\n";
break; break;
case 'daemon': case 'daemon':
$this->swoole_config['daemonize'] = 1; $this->swoole_server_config['daemonize'] = 1;
Console::$theme = 'no-color'; Console::$theme = 'no-color';
Console::log('已启用守护进程，输出重定向到 ' . $this->swoole_config['log_file']); Console::log('已启用守护进程，输出重定向到 ' . $this->swoole_server_config['log_file']);
$terminal_id = null; $terminal_id = null;
break; break;
case 'disable-console-input': case 'disable-console-input':