Rename generateSecret -> customSecret

ipfs-cluster · Jul 28, 2017 · 110a3e7 · 110a3e7
1 parent 73d4b1f
commit 110a3e7
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/ipfs-cluster-service/main.go b/ipfs-cluster-service/main.go
@@ -31,6 +31,9 @@ import (
 // ProgramName of this application
 const programName = `ipfs-cluster-service`
 
+// name of the environment variable that may store cluster secret
+const clusterEnvVar = `CLUSTER_SECRET`
+
 // We store a commit id here
 var commit string
 
@@ -214,9 +217,9 @@ configuration.
 			Action: func(c *cli.Context) error {
 				envSecret, envSecretDefined := os.LookupEnv("CLUSTER_SECRET")
 				if envSecretDefined {
-					initConfig(c.GlobalBool("force"), !c.Bool("custom-secret"), &envSecret)
+					initConfig(c.GlobalBool("force"), c.Bool("custom-secret"), &envSecret)
 				} else {
-					initConfig(c.GlobalBool("force"), !c.Bool("custom-secret"), nil)
+					initConfig(c.GlobalBool("force"), c.Bool("custom-secret"), nil)
 				}
 				return nil
 			},
@@ -369,7 +372,7 @@ func setupDebug() {
 	//SetFacilityLogLevel("libp2p-raft", l)
 }
 
-func initConfig(force bool, generateSecret bool, envSecret *string) {
+func initConfig(force bool, customSecret bool, envSecret *string) {
 	if _, err := os.Stat(configPath); err == nil && !force {
 		err := fmt.Errorf("%s exists. Try running with -f", configPath)
 		checkErr("", err)
@@ -382,7 +385,7 @@ func initConfig(force bool, generateSecret bool, envSecret *string) {
 		// read cluster secret from env variable
 		fmt.Println("Reading cluster secret from CLUSTER_SECRET environment variable.")
 		cfg.ClusterSecret, err = ipfscluster.DecodeClusterSecret(*envSecret)
-	} else if !generateSecret {
+	} else if customSecret {
 		// get cluster secret from user
 		cfg.ClusterSecret, err = ipfscluster.DecodeClusterSecret(promptUser("Enter cluster secret (32-byte hex string): "))