From 8efe1db01aab21268bf35d685ce643cb7ae5dde5 Mon Sep 17 00:00:00 2001 From: Ryan Russell Date: Wed, 14 Sep 2022 13:59:55 -0500 Subject: [PATCH] refactor(various): `Listner` -> `Listener` readability improvements (#3672) * refactor(net_timeout): `listner` -> `listener` Signed-off-by: Ryan Russell * refactor(s3): `s3ApiLocalListner` -> `s3ApiLocalListener` Signed-off-by: Ryan Russell * refactor(filer): `localPublicListner` -> `localPublicListener` Signed-off-by: Ryan Russell * refactor(command): `masterLocalListner` -> `masterLocalListener` Signed-off-by: Ryan Russell * refactor(net_timeout): `ipListner` -> `ipListener` Signed-off-by: Ryan Russell Signed-off-by: Ryan Russell --- weed/command/filer.go | 6 +++--- weed/command/master.go | 6 +++--- weed/command/master_follower.go | 6 +++--- weed/command/s3.go | 10 +++++----- weed/util/net_timeout.go | 22 +++++++++++----------- 5 files changed, 25 insertions(+), 25 deletions(-) diff --git a/weed/command/filer.go b/weed/command/filer.go index 3a7bc0049..4aa537f46 100644 --- a/weed/command/filer.go +++ b/weed/command/filer.go @@ -250,7 +250,7 @@ func (fo *FilerOptions) startFiler() { if *fo.publicPort != 0 { publicListeningAddress := util.JoinHostPort(*fo.bindIp, *fo.publicPort) glog.V(0).Infoln("Start Seaweed filer server", util.Version(), "public at", publicListeningAddress) - publicListener, localPublicListner, e := util.NewIpAndLocalListeners(*fo.bindIp, *fo.publicPort, 0) + publicListener, localPublicListener, e := util.NewIpAndLocalListeners(*fo.bindIp, *fo.publicPort, 0) if e != nil { glog.Fatalf("Filer server public listener error on port %d:%v", *fo.publicPort, e) } @@ -259,9 +259,9 @@ func (fo *FilerOptions) startFiler() { glog.Fatalf("Volume server fail to serve public: %v", e) } }() - if localPublicListner != nil { + if localPublicListener != nil { go func() { - if e := http.Serve(localPublicListner, publicVolumeMux); e != nil { + if e := http.Serve(localPublicListener, publicVolumeMux); e != nil { glog.Errorf("Volume server fail to serve public: %v", e) } }() diff --git a/weed/command/master.go b/weed/command/master.go index 908299c8a..f20b2dc62 100644 --- a/weed/command/master.go +++ b/weed/command/master.go @@ -146,7 +146,7 @@ func startMaster(masterOption MasterOptions, masterWhiteList []string) { ms := weed_server.NewMasterServer(r, masterOption.toMasterOption(masterWhiteList), masterPeers) listeningAddress := util.JoinHostPort(*masterOption.ipBind, *masterOption.port) glog.V(0).Infof("Start Seaweed Master %s at %s", util.Version(), listeningAddress) - masterListener, masterLocalListner, e := util.NewIpAndLocalListeners(*masterOption.ipBind, *masterOption.port, 0) + masterListener, masterLocalListener, e := util.NewIpAndLocalListeners(*masterOption.ipBind, *masterOption.port, 0) if e != nil { glog.Fatalf("Master startup error: %v", e) } @@ -239,8 +239,8 @@ func startMaster(masterOption MasterOptions, masterWhiteList []string) { } httpS := &http.Server{Handler: r} - if masterLocalListner != nil { - go httpS.Serve(masterLocalListner) + if masterLocalListener != nil { + go httpS.Serve(masterLocalListener) } if useMTLS { diff --git a/weed/command/master_follower.go b/weed/command/master_follower.go index 5e5244c05..c4f0cfc3c 100644 --- a/weed/command/master_follower.go +++ b/weed/command/master_follower.go @@ -120,7 +120,7 @@ func startMasterFollower(masterOptions MasterOptions) { ms := weed_server.NewMasterServer(r, option, masters) listeningAddress := util.JoinHostPort(*masterOptions.ipBind, *masterOptions.port) glog.V(0).Infof("Start Seaweed Master %s at %s", util.Version(), listeningAddress) - masterListener, masterLocalListner, e := util.NewIpAndLocalListeners(*masterOptions.ipBind, *masterOptions.port, 0) + masterListener, masterLocalListener, e := util.NewIpAndLocalListeners(*masterOptions.ipBind, *masterOptions.port, 0) if e != nil { glog.Fatalf("Master startup error: %v", e) } @@ -144,8 +144,8 @@ func startMasterFollower(masterOptions MasterOptions) { // start http server httpS := &http.Server{Handler: r} - if masterLocalListner != nil { - go httpS.Serve(masterLocalListner) + if masterLocalListener != nil { + go httpS.Serve(masterLocalListener) } go httpS.Serve(masterListener) diff --git a/weed/command/s3.go b/weed/command/s3.go index 3c35e489c..aa435b822 100644 --- a/weed/command/s3.go +++ b/weed/command/s3.go @@ -215,7 +215,7 @@ func (s3opt *S3Options) startS3Server() bool { } listenAddress := fmt.Sprintf("%s:%d", *s3opt.bindIp, *s3opt.port) - s3ApiListener, s3ApiLocalListner, err := util.NewIpAndLocalListeners(*s3opt.bindIp, *s3opt.port, time.Duration(10)*time.Second) + s3ApiListener, s3ApiLocalListener, err := util.NewIpAndLocalListeners(*s3opt.bindIp, *s3opt.port, time.Duration(10)*time.Second) if err != nil { glog.Fatalf("S3 API Server listener on %s error: %v", listenAddress, err) } @@ -243,9 +243,9 @@ func (s3opt *S3Options) startS3Server() bool { if *s3opt.tlsPrivateKey != "" { glog.V(0).Infof("Start Seaweed S3 API Server %s at https port %d", util.Version(), *s3opt.port) - if s3ApiLocalListner != nil { + if s3ApiLocalListener != nil { go func() { - if err = httpS.ServeTLS(s3ApiLocalListner, *s3opt.tlsCertificate, *s3opt.tlsPrivateKey); err != nil { + if err = httpS.ServeTLS(s3ApiLocalListener, *s3opt.tlsCertificate, *s3opt.tlsPrivateKey); err != nil { glog.Fatalf("S3 API Server Fail to serve: %v", err) } }() @@ -255,9 +255,9 @@ func (s3opt *S3Options) startS3Server() bool { } } else { glog.V(0).Infof("Start Seaweed S3 API Server %s at http port %d", util.Version(), *s3opt.port) - if s3ApiLocalListner != nil { + if s3ApiLocalListener != nil { go func() { - if err = httpS.Serve(s3ApiLocalListner); err != nil { + if err = httpS.Serve(s3ApiLocalListener); err != nil { glog.Fatalf("S3 API Server Fail to serve: %v", err) } }() diff --git a/weed/util/net_timeout.go b/weed/util/net_timeout.go index 022c651d9..f235a77b3 100644 --- a/weed/util/net_timeout.go +++ b/weed/util/net_timeout.go @@ -83,14 +83,14 @@ func (c *Conn) Close() error { return err } -func NewListener(addr string, timeout time.Duration) (ipListner net.Listener, err error) { - listner, err := net.Listen("tcp", addr) +func NewListener(addr string, timeout time.Duration) (ipListener net.Listener, err error) { + listener, err := net.Listen("tcp", addr) if err != nil { return } - ipListner = &Listener{ - Listener: listner, + ipListener = &Listener{ + Listener: listener, ReadTimeout: timeout, WriteTimeout: timeout, } @@ -98,27 +98,27 @@ func NewListener(addr string, timeout time.Duration) (ipListner net.Listener, er return } -func NewIpAndLocalListeners(host string, port int, timeout time.Duration) (ipListner net.Listener, localListener net.Listener, err error) { - listner, err := net.Listen("tcp", JoinHostPort(host, port)) +func NewIpAndLocalListeners(host string, port int, timeout time.Duration) (ipListener net.Listener, localListener net.Listener, err error) { + listener, err := net.Listen("tcp", JoinHostPort(host, port)) if err != nil { return } - ipListner = &Listener{ - Listener: listner, + ipListener = &Listener{ + Listener: listener, ReadTimeout: timeout, WriteTimeout: timeout, } if host != "localhost" && host != "" && host != "0.0.0.0" && host != "127.0.0.1" && host != "[::]" && host != "[::1]" { - listner, err = net.Listen("tcp", JoinHostPort("localhost", port)) + listener, err = net.Listen("tcp", JoinHostPort("localhost", port)) if err != nil { glog.V(0).Infof("skip starting on %s:%d: %v", host, port, err) - return ipListner, nil, nil + return ipListener, nil, nil } localListener = &Listener{ - Listener: listner, + Listener: listener, ReadTimeout: timeout, WriteTimeout: timeout, }