From c30a5a609c54f2fda5926a344e79ac7044c54fd9 Mon Sep 17 00:00:00 2001
From: zhoudw <zhoudw@infobird.com>
Date: Thu, 06 Jan 2022 09:51:48 +0800
Subject: [PATCH] log

---
 ws_server.php |   45 ++++++++++++++++++++++-----------------------
 1 files changed, 22 insertions(+), 23 deletions(-)

diff --git a/ws_server.php b/ws_server.php
index 4eaa615..7eaa5a6 100644
--- a/ws_server.php
+++ b/ws_server.php
@@ -35,14 +35,14 @@
         //     //'heartbeat_idle_time' => 2000,        // 连接最大允许空闲的时间(秒),与heartbeat_check_interval配合使用.当dispatch_mode=1/3时,底层会屏蔽onConnect/onClose事件
         //     //'heartbeat_check_interval' => 2,   // 表示每隔多久轮循一次,单位为秒
         // ));
-        /*
+   
         $this->server->set([
-            // 'task_worker_num'       => 8,
-            // 'enable_coroutine'      => true,
-            // 'task_enable_coroutine' => true,
+            'task_worker_num'       => 4,
+            'enable_coroutine'      => true,
+            'task_enable_coroutine' => true,
             'max_conn'              => 100000,
         ]);
-        */
+        
         $this->server->on('WorkerStart', function (Swoole\WebSocket\Server $server) {
             if (!$this->redis) {
                 $this->redis = new Redis();
@@ -61,8 +61,23 @@
         });
 
         $this->server->on('message', function (Swoole\WebSocket\Server $server, $frame) {
-            // $server->task($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) {
             $ret = array('code' => 0, 'data' => null);
+            $frame = $task->data;
             $msgData = $this->is_json($frame->data,true);
             if($msgData){
                 $frameData = $msgData;
@@ -74,21 +89,6 @@
                 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'] ); 
@@ -124,7 +124,7 @@
         $url = $msgContent['url'];
         $data = $msgContent['data'];
         $action = substr($url, strrpos($url, "/") + 1);
-        $this->log('action','ws','ws',$action);
+        // $this->log('action','ws','ws',$action);
         switch ($action)
         {
         case "reg":
@@ -250,7 +250,6 @@
 
     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