From 7e81a5144e19e7f2f6133e041632655ab0bd6f58 Mon Sep 17 00:00:00 2001 From: Conner Fromknecht Date: Thu, 20 Jun 2019 16:53:56 -0700 Subject: [PATCH] watchtower: rename DefaultPeerPortStr -> DefaultListenAddr --- watchtower/conf.go | 5 +++-- watchtower/config.go | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/watchtower/conf.go b/watchtower/conf.go index 21210995..bf071ae8 100644 --- a/watchtower/conf.go +++ b/watchtower/conf.go @@ -1,6 +1,7 @@ package watchtower import ( + "strconv" "time" ) @@ -36,7 +37,7 @@ func (c *Conf) Apply(cfg *Config, // If no addresses are specified by the Config, we will resort // to the default peer port. if len(c.RawListeners) == 0 { - addr := DefaultPeerPortStr + addr := DefaultListenAddr c.RawListeners = append(c.RawListeners, addr) } @@ -44,7 +45,7 @@ func (c *Conf) Apply(cfg *Config, // used by the brontide listener. var err error cfg.ListenAddrs, err = normalizer( - c.RawListeners, DefaultPeerPortStr, + c.RawListeners, strconv.Itoa(DefaultPeerPort), cfg.Net.ResolveTCPAddr, ) if err != nil { diff --git a/watchtower/config.go b/watchtower/config.go index b8136682..f5b5721e 100644 --- a/watchtower/config.go +++ b/watchtower/config.go @@ -28,8 +28,9 @@ const ( ) var ( - // DefaultPeerPortStr is the default server port as a string. - DefaultPeerPortStr = fmt.Sprintf(":%d", DefaultPeerPort) + // DefaultListenAddr is the default watchtower address listening on all + // interfaces. + DefaultListenAddr = fmt.Sprintf(":%d", DefaultPeerPort) ) // Config defines the resources and parameters used to configure a Watchtower.