Merge pull request #4 from coretech/increase_timeout

Add ability to provide http timeout for client via CLI option

Author: eduardev

README.md

@@ -308,6 +308,15 @@ This is the number of seconds you want Gonsul to wait between checks on the repo
 This is the file extensions that Gonsul should consider as inputs to populate our Consul. Please set each extension 
 without the dot, and separate each extension with a comma.
 
+
+### `--timeout`
+> `require:` **no**  
+> `default:` **5**  
+> `example:` **`--timeout=20`**
+
+The number of seconds for the client to wait for a response from Consul
+
+
 ## Gonsul Exit Codes
 Whenever an error occurs, and Gonsul exits with a code other than 0, we try to return a meaningful code, such as:
 

configuration/config.go

@@ -41,6 +41,7 @@ type Config struct {
 	pollInterval   	int
 	Working			chan bool
 	validExtensions	[]string
+	timeout   			int
 }
 
 func GetConfig(flagParser interfaces.IConfigFlags) (*Config, error) {
@@ -131,6 +132,7 @@ func buildConfig(flags interfaces.ConfigFlags) (*Config, error) {
 		pollInterval:   	*flags.PollInterval,
 		Working: 			make(chan bool, 1),
 		validExtensions: 	extensions,
+		timeout:   				*flags.Timeout,
 	}, nil
 }
 
@@ -210,6 +212,10 @@ func (config *Config) GetValidExtensions() []string {
 	return config.validExtensions
 }
 
+func (config *Config) GetTimeout() int {
+	return config.timeout
+}
+
 func buildSecretsMap(secretsFile string, repoRootPath string) (map[string]string, error) {
 	var file = secretsFile
 	if _, err := os.Stat(file); os.IsNotExist(err) {

configuration/config_test.go

@@ -111,6 +111,7 @@ func getConfigFlagsFor(
 		AllowDeletes: &ad,
 		PollInterval: &pi,
 		ValidExtensions: &ie,
+		Timeout:         &ti,
 	}
 
 	return configFlags

configuration/flags.go

@@ -31,6 +31,7 @@ func (flags *ConfigFlagsParser) Parse() interfaces.ConfigFlags {
 	flags.Flags.AllowDeletes = flag.Bool("allow-deletes", false, "Show Gonsul issue deletes? (If not, nothing will be done and a report on conflicting deletes will be shown) (Default false)")
 	flags.Flags.PollInterval = flag.Int("poll-interval", 60, "The number of seconds for the repository polling interval")
 	flags.Flags.ValidExtensions = flag.String("input-ext", "json,txt,ini", "A comma separated list of file extensions valid as input")
+	flags.Flags.Timeout = flag.Int("timeout", 5, "The number of seconds for the client to wait for a response from Consul")
 
 	// Parse our command line flags
 	flag.Parse()

importer/importer.go

@@ -29,7 +29,7 @@ func Start(localData map[string]string, conf *configuration.Config, log *errorut
 	// create a Client
 	// A Client is an HTTP client
 	client := &http.Client{
-		Timeout: time.Second * 5,
+		Timeout: time.Second * time.Duration(conf.GetTimeout()),
 	}
 
 	// Populate our Consul live data

interfaces/configurations.go

@@ -18,6 +18,7 @@ type ConfigFlags struct {
 	AllowDeletes    *bool
 	PollInterval    *int
 	ValidExtensions *string
+	Timeout         *int
 }
 
 type IConfigFlags interface {