Rename NSM_CONNECT_TIMEOUT to NSM_DIAL_TIMEOUT

Signed-off-by: Vladimir Popov <[email protected]>
networkservicemesh · Jan 19, 2021 · aa38cfc · aa38cfc
1 parent 07a440f
commit aa38cfc
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/README.md b/README.md
@@ -10,7 +10,7 @@ This README will provide directions for building, testing, and debugging that co
 
 * NSM_NAME - A string value of network service client name (default "nsc")
 * NSM_CONNECT_TO - A Network service Manager connectTo URL (default "unix:///var/lib/networkservicemesh/nsm.io.sock")
-* NSM_CONNECT_TIMEOUT - A timeout to connect to Network Service Manager (default 5s)
+* NSM_DIAL_TIMEOUT - A timeout to dial Network Service Manager (default 5s)
 * NSM_REQUEST_TIMEOUT - A timeout to request Network Service Endpoint (default 5m)
 * NSM_MAX_TOKEN_LIFETIME - A token lifetime duration (default 24h)
 * NSM_LABELS - A list of client labels with format key1=val1,key2=val2, will be used a primary list for network services

diff --git a/internal/config/config.go b/internal/config/config.go
@@ -37,7 +37,7 @@ var configMechanisms = map[string]string{
 type Config struct {
 	Name             string        `default:"nsc" desc:"Name of Network Service Client"`
 	ConnectTo        url.URL       `default:"unix:///var/lib/networkservicemesh/nsm.io.sock" desc:"url to connect to NSM" split_words:"true"`
-	ConnectTimeout   time.Duration `default:"5s" desc:"timeout to connect to NSMgr" split_words:"true"`
+	DialTimeout      time.Duration `default:"5s" desc:"timeout to dial NSMgr" split_words:"true"`
 	RequestTimeout   time.Duration `default:"5m" desc:"timeout to request NSE" split_words:"true"`
 	MaxTokenLifetime time.Duration `default:"24h" desc:"maximum lifetime of tokens" split_words:"true"`
 

diff --git a/main.go b/main.go
@@ -113,7 +113,7 @@ func main() {
 	// ********************************************************************************
 	log.Entry(ctx).Infof("Performing cleanup of connections due terminate...")
 
-	ctx, cancel = context.WithTimeout(context.Background(), rootConf.ConnectTimeout)
+	ctx, cancel = context.WithTimeout(context.Background(), rootConf.DialTimeout)
 	defer cancel()
 
 	cleanup(ctx)
@@ -137,7 +137,7 @@ func nsmClientFactory(ctx context.Context, rootConf *config.Config) func(...netw
 	// ********************************************************************************
 	// Connect to NSManager
 	// ********************************************************************************
-	connectCtx, cancel := context.WithTimeout(ctx, rootConf.ConnectTimeout)
+	connectCtx, cancel := context.WithTimeout(ctx, rootConf.DialTimeout)
 	defer cancel()
 
 	log.Entry(ctx).Infof("NSC: Connecting to Network Service Manager %v", rootConf.ConnectTo.String())