From 6f73a8496ee81f5d708cae320e8deea37fdc562e Mon Sep 17 00:00:00 2001
From: zhoudw <zhoudw@infobird.com>
Date: Tue, 21 Dec 2021 17:15:28 +0800
Subject: [PATCH] 去掉task
---
ws_server.php | 61 ++++++++++++++++--------------
1 files changed, 33 insertions(+), 28 deletions(-)
diff --git a/ws_server.php b/ws_server.php
index a47255d..93efe38 100644
--- a/ws_server.php
+++ b/ws_server.php
@@ -22,42 +22,31 @@
$this->server = new Swoole\WebSocket\Server($this->server_config['host'], $this->server_config['port']); // swoole连接
$this->server->set([
- 'task_worker_num' => 8,
- 'enable_coroutine' => true,
- 'task_enable_coroutine' => true
+ // 'task_worker_num' => 8,
+ // 'enable_coroutine' => true,
+ // 'task_enable_coroutine' => true,
+ 'max_conn' => 100000,
]);
- if (!$this->redis) {
- $this->redis = new Redis();
- $this->redis->connect($this->redis_config['host'],$this->redis_config['port'] );
- $host = $this->server_config['allow_ip'];
- $keyList = $this->redis->keys("*{$host}*");
- foreach ($keyList as $key => $value) {
- $this->redis->del($value);
+ $this->server->on('WorkerStart', function (Swoole\WebSocket\Server $server) {
+ if (!$this->redis) {
+ $this->redis = new Redis();
+ $this->redis->connect($this->redis_config['host'],$this->redis_config['port'] );
+ $host = $this->server_config['allow_ip'];
+ $keyList = $this->redis->keys("*{$host}*");
+ foreach ($keyList as $key => $value) {
+ $this->redis->del($value);
+ }
+ $this->redis->del("{$host}*");
+ $this->redis->close();
}
- $this->redis->close();
- }
+ });
$this->server->on('start', function (Swoole\WebSocket\Server $server) {
echo "Websocket Server is started at ws://".$this->server_config['host'].":".$this->server_config['port']."\n";
});
$this->server->on('message', function (Swoole\WebSocket\Server $server, $frame) {
- $server->task($frame);
- // $ret = array('code' => 0, 'data' => null);
- // $msgData = $this->is_json($frame->data,true);
- // if($msgData){
- // $frameData = $msgData;
- // $this->dealMsg($frameData,$frame->fd);
- // }else{
- // $ret['code'] = -1;
- // $ret['msg'] = 'data is null or data no json';
- // $server->push($frame->fd, json_encode($ret));
- // return;
- // }
- });
-
- $this->server->on('task', function ($server, $task) {
+ // $server->task($frame);
$ret = array('code' => 0, 'data' => null);
- $frame = $task->data;
$msgData = $this->is_json($frame->data,true);
if($msgData){
$frameData = $msgData;
@@ -69,6 +58,21 @@
return;
}
});
+
+ // $this->server->on('task', function ($server, $task) {
+ // $ret = array('code' => 0, 'data' => null);
+ // $frame = $task->data;
+ // $msgData = $this->is_json($frame->data,true);
+ // if($msgData){
+ // $frameData = $msgData;
+ // $this->dealMsg($frameData,$frame->fd);
+ // }else{
+ // $ret['code'] = -1;
+ // $ret['msg'] = 'data is null or data no json';
+ // $server->push($frame->fd, json_encode($ret));
+ // return;
+ // }
+ // });
$this->server->on('close', function ($ser, $fd) {
$host = $this->server_config['allow_ip'];
$this->redis->connect($this->redis_config['host'],$this->redis_config['port'] );
@@ -230,6 +234,7 @@
function log($title,$folder,$finename,$msg)
{
+ return;
$logs = json_encode($msg);
$msg = "[".date('Y-m-d H:i:s')."]\t- INFO - ".$title." - ".$logs."\n";
//判断目的文件夹是否存在? 如果不存在就生成
--
Gitblit v1.8.0