status-im
/
consul
mirror of https://github.com/status-im/consul.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Moves flag slice helper into configutil.

This commit is contained in:
James Phillips 2017-06-20 12:52:35 -07:00
parent 902f1ce16f
commit 6b2ad20131
No known key found for this signature in database
GPG Key ID: 77183E682AC5FC11
5 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
command/agent.go
View File

@ -18,6 +18,7 @@ import (
"github.com/armon/go-metrics/datadog"
"github.com/hashicorp/consul/agent"
"github.com/hashicorp/consul/agent/consul/structs"
"github.com/hashicorp/consul/configutil"
"github.com/hashicorp/consul/ipaddr"
"github.com/hashicorp/consul/lib"
"github.com/hashicorp/consul/logger"
@ -61,15 +62,15 @@ func (cmd *AgentCommand) readConfig() *agent.Config {
f := cmd.BaseCommand.NewFlagSet(cmd)
f.Var((*AppendSliceValue)(&cfgFiles), "config-file",
f.Var((*configutil.AppendSliceValue)(&cfgFiles), "config-file",
"Path to a JSON file to read configuration from. This can be specified multiple times.")
f.Var((*AppendSliceValue)(&cfgFiles), "config-dir",
f.Var((*configutil.AppendSliceValue)(&cfgFiles), "config-dir",
"Path to a directory to read configuration files from. This will read every file ending "+
"in '.json' as configuration in this directory in alphabetical order. This can be "+
"specified multiple times.")
f.Var((*AppendSliceValue)(&dnsRecursors), "recursor",
f.Var((*configutil.AppendSliceValue)(&dnsRecursors), "recursor",
"Address of an upstream DNS server. Can be specified multiple times.")
f.Var((*AppendSliceValue)(&nodeMeta), "node-meta",
f.Var((*configutil.AppendSliceValue)(&nodeMeta), "node-meta",
"An arbitrary metadata key/value pair for this node, of the format `key:value`. Can be specified multiple times.")
f.BoolVar(&dev, "dev", false, "Starts the agent in development mode.")
@ -120,11 +121,11 @@ func (cmd *AgentCommand) readConfig() *agent.Config {
"Enables logging to syslog.")
f.BoolVar(&cmdCfg.RejoinAfterLeave, "rejoin", false,
"Ignores a previous leave and attempts to rejoin the cluster.")
f.Var((*AppendSliceValue)(&cmdCfg.StartJoin), "join",
f.Var((*configutil.AppendSliceValue)(&cmdCfg.StartJoin), "join",
"Address of an agent to join at start time. Can be specified multiple times.")
f.Var((*AppendSliceValue)(&cmdCfg.StartJoinWan), "join-wan",
f.Var((*configutil.AppendSliceValue)(&cmdCfg.StartJoinWan), "join-wan",
"Address of an agent to join -wan at start time. Can be specified multiple times.")
f.Var((*AppendSliceValue)(&cmdCfg.RetryJoin), "retry-join",
f.Var((*configutil.AppendSliceValue)(&cmdCfg.RetryJoin), "retry-join",
"Address of an agent to join at start time with retries enabled. Can be specified multiple times.")
f.IntVar(&cmdCfg.RetryMaxAttempts, "retry-max", 0,
"Maximum number of join attempts. Defaults to 0, which will retry indefinitely.")
@ -148,7 +149,7 @@ func (cmd *AgentCommand) readConfig() *agent.Config {
"Azure tag name to filter on for server discovery.")
f.StringVar(&cmdCfg.RetryJoinAzure.TagValue, "retry-join-azure-tag-value", "",
"Azure tag value to filter on for server discovery.")
f.Var((*AppendSliceValue)(&cmdCfg.RetryJoinWan), "retry-join-wan",
f.Var((*configutil.AppendSliceValue)(&cmdCfg.RetryJoinWan), "retry-join-wan",
"Address of an agent to join -wan at start time with retries enabled. "+
"Can be specified multiple times.")
f.IntVar(&cmdCfg.RetryMaxAttemptsWan, "retry-max-wan", 0,

5
command/configtest.go
View File

@ -5,6 +5,7 @@ import (
"strings"
"github.com/hashicorp/consul/agent"
"github.com/hashicorp/consul/configutil"
)
// ConfigTestCommand is a Command implementation that is used to
@ -36,9 +37,9 @@ func (c *ConfigTestCommand) Run(args []string) int {
var configFiles []string
f := c.BaseCommand.NewFlagSet(c)
f.Var((*AppendSliceValue)(&configFiles), "config-file",
f.Var((*configutil.AppendSliceValue)(&configFiles), "config-file",
"Path to a JSON file to read configuration from. This can be specified multiple times.")
f.Var((*AppendSliceValue)(&configFiles), "config-dir",
f.Var((*configutil.AppendSliceValue)(&configFiles), "config-dir",
"Path to a directory to read configuration files from. This will read every file ending in "+
".json as configuration in this directory in alphabetical order.")

5
command/validate.go
View File

@ -5,6 +5,7 @@ import (
"strings"
"github.com/hashicorp/consul/agent"
"github.com/hashicorp/consul/configutil"
)
// ValidateCommand is a Command implementation that is used to
@ -35,9 +36,9 @@ func (c *ValidateCommand) Run(args []string) int {
var quiet bool
f := c.BaseCommand.NewFlagSet(c)
f.Var((*AppendSliceValue)(&configFiles), "config-file",
f.Var((*configutil.AppendSliceValue)(&configFiles), "config-file",
"Path to a JSON file to read configuration from. This can be specified multiple times.")
f.Var((*AppendSliceValue)(&configFiles), "config-dir",
f.Var((*configutil.AppendSliceValue)(&configFiles), "config-dir",
"Path to a directory to read configuration files from. This will read every file ending in "+
".json as configuration in this directory in alphabetical order.")
f.BoolVar(&quiet, "quiet", false,

2
command/flag_slice_value.go → configutil/flag_slice_value.go
View File

@ -1,4 +1,4 @@
package command
package configutil
import "strings"

2
command/flag_slice_value_test.go → configutil/flag_slice_value_test.go
View File

@ -1,4 +1,4 @@
package command
package configutil
import (
"flag"