Merge branch 'patch/v2.2.0.4' into experiment/reloader

zetaab · Aug 23, 2016 · bd1f486 · bd1f486
2 parents 6cce637 + 0a3c6ce
commit bd1f486
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 2 deletions.
diff --git a/.gitignore b/.gitignore
@@ -23,6 +23,8 @@ test.*.conf
 *.mprof
 apps/test.json
 logs
+live_hybrid.conf
+tyk.zeroconf.conf
 lint_results.txt
 build/
 test_apps/

diff --git a/tyk_reverse_proxy_clone.go b/tyk_reverse_proxy_clone.go
@@ -52,7 +52,16 @@ func GetNextTarget(targetData interface{}, spec *APISpec, tryCount int) string {
 		log.Debug("[PROXY] [LOAD BALANCING] Load balancer enabled, getting upstream target")
 		// Use a list
 		spec.RoundRobin.SetMax(targetData)
-		td := *targetData.(*[]string)
+		var td []string
+
+		switch targetData.(type) {
+		case *[]string:
+			td = *targetData.(*[]string)
+		case []string:
+			td = targetData.([]string)
+		}
+
+		//td := *targetData.(*[]string)
 
 		pos := spec.RoundRobin.GetPos()
 		if pos > (len(td) - 1) {

diff --git a/version.go b/version.go
@@ -1,3 +1,3 @@
 package main
 
-var VERSION string = "v2.2.0.2"
+var VERSION string = "v2.2.0.4"