unify naming convention

zhiqiangxu · Mar 26, 2020 · 8d40445 · 8d40445
1 parent 8c72dd7
commit 8d40445
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 24 deletions.
diff --git a/conf.go b/conf.go
@@ -26,27 +26,27 @@ type ServerLifecycleCallbacks struct {
 
 // ServerBinding contains binding infos
 type ServerBinding struct {
-	Addr                             string
-	Handler                          Handler // handler to invoke
-	DefaultReadTimeout               int
-	DefaultWriteTimeout              int
-	WBufSize                         int // best effort only, check log for error
-	RBufSize                         int // best effort only, check log for error
-	ReadFrameChSize                  int
-	WriteFrameChSize                 int
-	MaxFrameSize                     int
-	MaxCloseRate                     int // per second
-	MaxInboundFramePerSecond         int
-	MaxInboundInflightStreamsPerConn int32 // connection will be closed when exceeded
-	ListenFunc                       func(network, address string) (net.Listener, error)
-	Codec                            CompressorCodec
-	OverlayNetwork                   func(net.Listener, *tls.Config) Listener
-	OnKickCB                         func(w FrameWriter)
-	LatencyMetric                    metrics.Histogram
-	CounterMetric                    metrics.Counter
-	TLSConf                          *tls.Config
-	LifecycleCallbacks               ServerLifecycleCallbacks
-	ln                               Listener
+	Addr                            string
+	Handler                         Handler // handler to invoke
+	DefaultReadTimeout              int
+	DefaultWriteTimeout             int
+	WBufSize                        int // best effort only, check log for error
+	RBufSize                        int // best effort only, check log for error
+	ReadFrameChSize                 int
+	WriteFrameChSize                int
+	MaxFrameSize                    int
+	MaxCloseRate                    int // per second
+	MaxInboundFramePerSecond        int
+	MaxInboundInflightStreamPerConn int32 // connection will be closed when exceeded
+	ListenFunc                      func(network, address string) (net.Listener, error)
+	Codec                           CompressorCodec
+	OverlayNetwork                  func(net.Listener, *tls.Config) Listener
+	OnKickCB                        func(w FrameWriter)
+	LatencyMetric                   metrics.Histogram
+	CounterMetric                   metrics.Counter
+	TLSConf                         *tls.Config
+	LifecycleCallbacks              ServerLifecycleCallbacks
+	ln                              Listener
 }
 
 // SubFunc for subscribe callback

diff --git a/serveconn.go b/serveconn.go
@@ -184,7 +184,7 @@ func (sc *serveconn) serve() {
 
 	handler := binding.Handler
 
-	checkInflightStreams := binding.MaxInboundInflightStreamsPerConn > 0
+	checkInflightStreams := binding.MaxInboundInflightStreamPerConn > 0
 	var inflightStreams int32
 
 	for {
@@ -201,8 +201,8 @@ func (sc *serveconn) serve() {
 				res.readMore()
 			} else {
 				if checkInflightStreams {
-					if atomic.AddInt32(&inflightStreams, 1) > binding.MaxInboundInflightStreamsPerConn {
-						l.Error("MaxInboundInflightStreamsPerConn exceeded", zap.String("ip", sc.RemoteAddr()))
+					if atomic.AddInt32(&inflightStreams, 1) > binding.MaxInboundInflightStreamPerConn {
+						l.Error("MaxInboundInflightStreamPerConn exceeded", zap.String("ip", sc.RemoteAddr()))
 						return
 					}
 				}