using GetDuration in HTTP reporter timeout

topfreegames · Sep 27, 2018 · db54415 · db54415
1 parent f75f912
commit db54415
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/config/local.yaml b/config/local.yaml
@@ -37,6 +37,10 @@ reporters:
     host: "0.0.0.0:8125"
     prefix: "maestro."
     region: "region"
+  http:
+    timeout: "5s"
+    putURL: "localhost:8080"
+    region: "region"
 scaleUpTimeoutSeconds: 600
 scaleDownTimeoutSeconds: 600
 deleteTimeoutSeconds: 600

diff --git a/config/test.yaml b/config/test.yaml
@@ -27,6 +27,10 @@ reporters:
     host: "0.0.0.0:8125"
     prefix: "test."
     region: "test"
+  http:
+    timeout: "5s"
+    putURL: "localhost:8080"
+    region: "test"
 scaleUpTimeoutSeconds: 300
 scaleDownTimeoutSeconds: 300
 deleteTimeoutSeconds: 300

diff --git a/reporters/http.go b/reporters/http.go
@@ -106,16 +106,16 @@ func MakeHTTP(config *viper.Viper, logger *logrus.Logger, r *Reporters) {
 func loadDefaultHTTPConfigs(c *viper.Viper) {
 	c.SetDefault("reporters.http.putURL", "http://localhost:8080")
 	c.SetDefault("reporters.http.region", "test")
-	c.SetDefault("reporters.http.timeoutMs", "5000")
+	c.SetDefault("reporters.http.timeout", "5s")
 }
 
 // NewHTTP creates an HTTP struct using putURL and region from config
 func NewHTTP(config *viper.Viper, logger *logrus.Logger) (*HTTP, error) {
 	loadDefaultHTTPConfigs(config)
 	putURL := config.GetString("reporters.http.putURL")
 	region := config.GetString("reporters.http.region")
-	timeoutMs := config.GetInt64("reporters.http.timeoutMs")
-	client := NewHTTPClient(putURL, time.Duration(timeoutMs)*time.Millisecond)
+	timeout := config.GetDuration("reporters.http.timeout")
+	client := NewHTTPClient(putURL, timeout)
 	httpR := &HTTP{client: client, region: region}
 	return httpR, nil
 }