added fix for possible 503s during reload of config.

martensson · Jan 15, 2016 · cfc8c06 · cfc8c06
1 parent b4f5104
commit cfc8c06
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/marathon.go b/marathon.go
@@ -132,9 +132,9 @@ func fetchApps(jsontasks *MarathonTasks, jsonapps *MarathonApps) error {
 }
 
 func syncApps(jsontasks *MarathonTasks, jsonapps *MarathonApps) {
-	apps = Apps{Apps: make(map[string]App)}
 	apps.Lock()
 	defer apps.Unlock()
+	apps.Apps = make(map[string]App)
 	for _, task := range jsontasks.Tasks {
 		// Use regex to remove characters that are not allowed in hostnames
 		re := regexp.MustCompile("[^0-9a-z-]")

diff --git a/moxy.go b/moxy.go
@@ -48,6 +48,8 @@ func moxy_proxy(w http.ResponseWriter, r *http.Request) {
 	if config.Xproxy != "" {
 		w.Header().Add("X-Proxy", config.Xproxy)
 	}
+	apps.RLock()
+	defer apps.RUnlock()
 	if s, ok := apps.Apps[app]; ok {
 		if config.Statsd != "" {
 			go func(app string) {