From eba3758b305e33fc9349c0e7190e6321d0d1749e Mon Sep 17 00:00:00 2001
From: xiongziliang <771730766@qq.com>
Date: Sat, 10 Jul 2021 23:54:08 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E6=8C=81=E8=AE=BE=E7=BD=AE=E3=80=81?=
 =?UTF-8?q?=E8=8E=B7=E5=8F=96=E7=BA=BF=E7=A8=8B=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 3rdpart/ZLToolKit | 2 +-
 server/main.cpp   | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/3rdpart/ZLToolKit b/3rdpart/ZLToolKit
index a04a723c..a3e4d965 160000
--- a/3rdpart/ZLToolKit
+++ b/3rdpart/ZLToolKit
@@ -1 +1 @@
-Subproject commit a04a723c2ffa9b59345f92608600299efaeca81d
+Subproject commit a3e4d9650f3f39dfc3d1d2a97e68b35d1892cad6
diff --git a/server/main.cpp b/server/main.cpp
index e0e2bd67..8acd507b 100644
--- a/server/main.cpp
+++ b/server/main.cpp
@@ -229,6 +229,8 @@ int start_main(int argc,char *argv[]) {
         string ssl_file = cmd_main["ssl"];
         int threads = cmd_main["threads"];
 
+        setThreadName("main thread");
+
         //设置日志
         Logger::Instance().add(std::make_shared<ConsoleChannel>("ConsoleChannel", logLevel));
 #ifndef ANDROID