From 3ffef7cd40c67f8c648f17065ecf087ac0a9fd7b Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Sat, 29 Jun 2024 15:10:22 +0800
Subject: [PATCH] 1

---
 server/hallserver/constant/constant.go     |  1 -
 server/hallserver/global/global.go         |  5 -----
 server/hallserver/listener/export.go       |  4 ++--
 server/hallserver/listener/httplistener.go | 19 -------------------
 third_party/f5                             |  2 +-
 5 files changed, 3 insertions(+), 28 deletions(-)
 delete mode 100644 server/hallserver/listener/httplistener.go

diff --git a/server/hallserver/constant/constant.go b/server/hallserver/constant/constant.go
index 30b87df8..6ef67a4d 100644
--- a/server/hallserver/constant/constant.go
+++ b/server/hallserver/constant/constant.go
@@ -30,7 +30,6 @@ const (
 	APP_MODULE_IDX
 	WSPLISTENER_MODULE_IDX
 	HANDLER_MGR_MODULE_IDX
-	HTTP_LISTENER_MODULE_IDX
 	PLAYER_MGR_MODULE_IDX
 	MAX_MODULE_IDX
 )
diff --git a/server/hallserver/global/global.go b/server/hallserver/global/global.go
index 6f215706..3e309a74 100644
--- a/server/hallserver/global/global.go
+++ b/server/hallserver/global/global.go
@@ -10,7 +10,6 @@ import (
 var modules [constant.MAX_MODULE_IDX]q5.Module
 var initOrders = []int32 {
 	constant.HANDLER_MGR_MODULE_IDX,
-	constant.HTTP_LISTENER_MODULE_IDX,
 	constant.PLAYER_MGR_MODULE_IDX,
 	constant.ROOMMGR_MODULE_IDX,
 	constant.WSPLISTENER_MODULE_IDX,
@@ -53,10 +52,6 @@ func RegModule(idx int32, m q5.Module) {
 		{
 			//wspListener = m.(.common.H)
 		}
-	case constant.HTTP_LISTENER_MODULE_IDX:
-		{
-			//wspListener = m.(.common.H)
-		}
 	case constant.PLAYER_MGR_MODULE_IDX:
 		{
 			playerMgr = m.(common.PlayerMgr)
diff --git a/server/hallserver/listener/export.go b/server/hallserver/listener/export.go
index bcb1bbdb..b4faf2f7 100644
--- a/server/hallserver/listener/export.go
+++ b/server/hallserver/listener/export.go
@@ -7,10 +7,10 @@ import (
 
 var _wspListener = new(WSPListener)
 var _handlerMgr = new(HandlerMgr)
-var _httpListener = new(httpListener)
+//var _httpListener = new(httpListener)
 
 func init() {
 	global.RegModule(constant.WSPLISTENER_MODULE_IDX, _wspListener)
 	global.RegModule(constant.HANDLER_MGR_MODULE_IDX, _handlerMgr)
-	global.RegModule(constant.HTTP_LISTENER_MODULE_IDX, _httpListener)
+	//global.RegModule(constant.HTTP_LISTENER_MODULE_IDX, _httpListener)
 }
diff --git a/server/hallserver/listener/httplistener.go b/server/hallserver/listener/httplistener.go
deleted file mode 100644
index 6849506a..00000000
--- a/server/hallserver/listener/httplistener.go
+++ /dev/null
@@ -1,19 +0,0 @@
-package listener
-
-import (
-	"f5"
-	"mt"
-)
-
-type httpListener struct {
-	httpServer *f5.HttpServer
-}
-
-func (this *httpListener) Init() {
-	this.httpServer = new(f5.HttpServer)
-	this.httpServer.Init("hallserver.httplistener", 1000*10)
-	this.httpServer.Start(mt.Table.HallCluster.GetHttpListenPort())
-}
-
-func (this *httpListener) UnInit() {
-}
diff --git a/third_party/f5 b/third_party/f5
index c767718a..faa5f840 160000
--- a/third_party/f5
+++ b/third_party/f5
@@ -1 +1 @@
-Subproject commit c767718aa4641ca073da443024432148953b4f23
+Subproject commit faa5f840af16de5b35bbc910e1bff239beb48413