Merge pull request #61 from victorcoder/fix-join

Fix and test more than one join flags
distribworks · Dec 20, 2015 · e2201e2 · e2201e2
2 parents f517e2b + 88567fb
commit e2201e2
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/dkron/agent.go b/dkron/agent.go
@@ -116,8 +116,8 @@ func (a *AgentCommand) readConfig(args []string) *Config {
 	cmdFlags.String("profile", "lan", "timing profile to use (lan, wan, local)")
 	viper.SetDefault("profile", cmdFlags.Lookup("profile").Value)
 	viper.SetDefault("server", cmdFlags.Bool("server", false, "start dkron server"))
-	startJoin := &AppendSliceValue{}
-	cmdFlags.Var(startJoin, "join", "address of agent to join on startup")
+	var startJoin []string
+	cmdFlags.Var((*AppendSliceValue)(&startJoin), "join", "address of agent to join on startup")
 	var tag []string
 	cmdFlags.Var((*AppendSliceValue)(&tag), "tag", "tag pair, specified as key=value")
 	cmdFlags.String("keyspace", "dkron", "key namespace to use")

diff --git a/dkron/agent_test.go b/dkron/agent_test.go
@@ -110,7 +110,8 @@ func TestAgentCommandElectLeader(t *testing.T) {
 
 	args2 := []string{
 		"-bind", a2Addr,
-		"-join", a1Addr,
+		"-join", a1Addr + ":8946",
+		"-join", a1Addr + ":8946",
 		"-node", "test2",
 		"-server",
 		"-debug",