Skip to content

Commit 3a8a54e

Browse files
Minor: Fix muxConnectManaNger typo (#145)
* Minor: Fix muxConnectManaNger typo * gofmt
1 parent 4aae78d commit 3a8a54e

3 files changed

Lines changed: 15 additions & 15 deletions

File tree

transport/mux_connection_manager.go

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ var (
4747
)
4848

4949
type (
50-
muxConnectMananger struct {
50+
muxConnectManager struct {
5151
config config.MuxTransportConfig
5252
muxTransport *muxTransportImpl
5353
shutdownCh chan struct{}
@@ -59,8 +59,8 @@ type (
5959
}
6060
)
6161

62-
func newMuxConnectManager(cfg config.MuxTransportConfig, logger log.Logger) *muxConnectMananger {
63-
cm := &muxConnectMananger{
62+
func newMuxConnectManager(cfg config.MuxTransportConfig, logger log.Logger) *muxConnectManager {
63+
cm := &muxConnectManager{
6464
config: cfg,
6565
logger: log.With(logger, tag.NewStringTag("Name", cfg.Name), tag.NewStringTag("Mode", string(cfg.Mode))),
6666
}
@@ -69,7 +69,7 @@ func newMuxConnectManager(cfg config.MuxTransportConfig, logger log.Logger) *mux
6969
return cm
7070
}
7171

72-
func (m *muxConnectMananger) open() (MuxTransport, error) {
72+
func (m *muxConnectManager) open() (MuxTransport, error) {
7373
if !m.isStarted() {
7474
return nil, fmt.Errorf("connection manager is not running")
7575
}
@@ -107,7 +107,7 @@ func (m *muxConnectMananger) open() (MuxTransport, error) {
107107
return muxTransport, nil
108108
}
109109

110-
func (m *muxConnectMananger) isShuttingDown() bool {
110+
func (m *muxConnectManager) isShuttingDown() bool {
111111
select {
112112
case <-m.shutdownCh:
113113
return true
@@ -116,7 +116,7 @@ func (m *muxConnectMananger) isShuttingDown() bool {
116116
}
117117
}
118118

119-
func (m *muxConnectMananger) serverLoop(metricLabels []string, setting config.TCPServerSetting) error {
119+
func (m *muxConnectManager) serverLoop(metricLabels []string, setting config.TCPServerSetting) error {
120120
var tlsConfig *tls.Config
121121
var err error
122122
if tlsCfg := setting.TLS; tlsCfg.IsEnabled() {
@@ -188,7 +188,7 @@ func (m *muxConnectMananger) serverLoop(metricLabels []string, setting config.TC
188188
return nil
189189
}
190190

191-
func (m *muxConnectMananger) clientLoop(metricLabels []string, setting config.TCPClientSetting) error {
191+
func (m *muxConnectManager) clientLoop(metricLabels []string, setting config.TCPClientSetting) error {
192192
var tlsConfig *tls.Config
193193
var err error
194194
if tlsCfg := setting.TLS; tlsCfg.IsEnabled() {
@@ -286,7 +286,7 @@ func observeYamuxSession(session *yamux.Session, config config.MuxTransportConfi
286286
}
287287
}
288288

289-
func (m *muxConnectMananger) start() error {
289+
func (m *muxConnectManager) start() error {
290290
if !m.status.CompareAndSwap(
291291
int32(statusInitialized),
292292
int32(statusStarted),
@@ -324,15 +324,15 @@ func (m *muxConnectMananger) start() error {
324324
return nil
325325
}
326326

327-
func (m *muxConnectMananger) isStarted() bool {
327+
func (m *muxConnectManager) isStarted() bool {
328328
return m.getStatus() == statusStarted
329329
}
330330

331-
func (m *muxConnectMananger) getStatus() status {
331+
func (m *muxConnectManager) getStatus() status {
332332
return status(m.status.Load())
333333
}
334334

335-
func (m *muxConnectMananger) stop() {
335+
func (m *muxConnectManager) stop() {
336336
if !m.status.CompareAndSwap(
337337
int32(statusStarted),
338338
int32(statusStopped),
@@ -345,7 +345,7 @@ func (m *muxConnectMananger) stop() {
345345
m.logger.Info("Connection manager stopped")
346346
}
347347

348-
func (m *muxConnectMananger) waitForReconnect() {
348+
func (m *muxConnectManager) waitForReconnect() {
349349
// Notify transport is connected
350350
close(m.connectedCh)
351351

transport/mux_connection_manager_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ func (s *service) DescribeCluster(ctx context.Context, in0 *adminservice.Describ
6060
}, nil
6161
}
6262

63-
func connect(t *testing.T, clientCM *muxConnectMananger, serverCM *muxConnectMananger) (MuxTransport, MuxTransport) {
63+
func connect(t *testing.T, clientCM *muxConnectManager, serverCM *muxConnectManager) (MuxTransport, MuxTransport) {
6464
clientTs, err := clientCM.open()
6565
require.NoError(t, err)
6666
serverTs, err := serverCM.open()

transport/transport.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ type (
3131
}
3232

3333
TransportManager struct {
34-
muxConnManagers map[string]*muxConnectMananger
34+
muxConnManagers map[string]*muxConnectManager
3535
logger log.Logger
3636
}
3737
)
@@ -41,7 +41,7 @@ func NewTransportManager(
4141
logger log.Logger,
4242
) *TransportManager {
4343

44-
muxConnManagers := make(map[string]*muxConnectMananger)
44+
muxConnManagers := make(map[string]*muxConnectManager)
4545
s2sConfig := configProvider.GetS2SProxyConfig()
4646
for _, cfg := range s2sConfig.MuxTransports {
4747
muxConnManagers[cfg.Name] = newMuxConnectManager(cfg, logger)

0 commit comments

Comments
 (0)