升级 gtcp,gudp 组件

camry · Nov 21, 2022 · bd60664 · bd60664
1 parent 1d090b2
commit bd60664
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 8 deletions.
diff --git a/go.mod b/go.mod
@@ -3,7 +3,7 @@ module github.com/camry/dove
 go 1.18
 
 require (
-	github.com/camry/g v1.2.2
+	github.com/camry/g v1.2.4
 	github.com/google/uuid v1.3.0
 	golang.org/x/sync v0.0.0-20210220032951-036812b2e83c
 	google.golang.org/grpc v1.46.0

diff --git a/go.sum b/go.sum
@@ -2,8 +2,8 @@ cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMT
 cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY=
-github.com/camry/g v1.2.2 h1:p/Q0AHpWcxTkxiJS2AAMmc1qJNUbdStMzHssV9Y8YOA=
-github.com/camry/g v1.2.2/go.mod h1:oHGlPoCKs7aJ6zeT2SfIpUfPE+jhAjnCRxXmknpSK5o=
+github.com/camry/g v1.2.4 h1:MFgNpjI4lPrd1Tlb4DxcI9aFgJYni4YKs65eA0dJaJo=
+github.com/camry/g v1.2.4/go.mod h1:oHGlPoCKs7aJ6zeT2SfIpUfPE+jhAjnCRxXmknpSK5o=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
 github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=

diff --git a/server/gtcp/gtcp_server.go b/server/gtcp/gtcp_server.go
@@ -3,6 +3,7 @@ package gtcp
 import (
     "context"
     "crypto/tls"
+
     "github.com/camry/g/glog"
     "github.com/camry/g/gnet/gtcp"
 )
@@ -43,7 +44,9 @@ type Server struct {
 // NewServer 新建 TCP 服务器。
 func NewServer(opts ...ServerOption) *Server {
     srv := &Server{
-        log: glog.NewHelper(glog.GetLogger()),
+        address: ":0",
+        handler: func(conn *gtcp.Conn) {},
+        log:     glog.NewHelper(glog.GetLogger()),
     }
     for _, opt := range opts {
         opt(srv)
@@ -54,7 +57,7 @@ func NewServer(opts ...ServerOption) *Server {
 
 // Start 启动 TCP 服务器。
 func (s *Server) Start(ctx context.Context) (err error) {
-    s.log.Infof("[TCP] server listening on: %s", s.Listener().Addr().String())
+    s.log.Infof("[TCP] server listening on %s", s.GetListenedAddress())
     return s.Run(ctx)
 }
 

diff --git a/server/gudp/gudp_server.go b/server/gudp/gudp_server.go
@@ -2,6 +2,7 @@ package gudp
 
 import (
     "context"
+
     "github.com/camry/g/glog"
     "github.com/camry/g/gnet/gudp"
 )
@@ -28,7 +29,6 @@ func Handler(handler func(*gudp.Conn)) ServerOption {
 type Server struct {
     *gudp.Server
 
-    network string           // UDP 服务器网络协议。
     address string           // UDP 服务器监听地址。
     handler func(*gudp.Conn) // UDP 连接的处理程序。
     log     *glog.Helper     // 日志助手。
@@ -37,7 +37,6 @@ type Server struct {
 // NewServer 新建 UDP 服务器。
 func NewServer(opts ...ServerOption) *Server {
     srv := &Server{
-        network: "udp",
         address: ":0",
         handler: func(conn *gudp.Conn) {},
         log:     glog.NewHelper(glog.GetLogger()),
@@ -51,7 +50,7 @@ func NewServer(opts ...ServerOption) *Server {
 
 // Start 启动 UDP 服务器。
 func (s *Server) Start(ctx context.Context) error {
-    s.log.Infof("[UDP] server listening on: %s", s.Conn().LocalAddr().String())
+    s.log.Infof("[UDP] server listening on %s", s.GetListenedAddress())
     return s.Run(ctx)
 }