BUG: Adds mutex to reloading

Author: thomasjpfan

proxy/ha_proxy.go

@@ -7,6 +7,7 @@ import (
 	"sort"
 	"strconv"
 	"strings"
+	"sync"
 	"text/template"
 	"time"
 )
@@ -23,6 +24,9 @@ var Instance proxy
 
 var reloadPause time.Duration = 1000
 
+var certMu = &sync.Mutex{}
+var reloadMu = &sync.Mutex{}
+
 // TODO: Move to data from proxy.go when static (e.g. env. vars.)
 type configData struct {
 	CertsString          string
@@ -143,6 +147,8 @@ func (m HaProxy) ReadConfig() (string, error) {
 
 // Reload HAProxy
 func (m HaProxy) Reload() error {
+	reloadMu.Lock()
+	defer reloadMu.Unlock()
 	logPrintf("Reloading the proxy")
 	var reloadErr error
 	reconfigureAttempts := 20
@@ -332,8 +338,8 @@ func (m *HaProxy) getCertsConfigSnippet() string {
 			h2 = "h2,"
 		}
 		certs = fmt.Sprintf(" ssl crt-list /cfg/crt-list.txt alpn %shttp/1.1", h2)
-		mu.Lock()
-		defer mu.Unlock()
+		certMu.Lock()
+		defer certMu.Unlock()
 		writeFile("/cfg/crt-list.txt", []byte(strings.Join(certPaths, "\n")), 0664)
 	}
 	if len(os.Getenv("CA_FILE")) > 0 {

proxy/util.go

@@ -12,7 +12,6 @@ import (
 	"os/exec"
 	"regexp"
 	"strings"
-	"sync"
 	"syscall"
 	"time"
 	"unicode"
@@ -142,5 +141,3 @@ func replaceNonAlphabetAndNumbers(value []string) string {
 	reg, _ := regexp.Compile("[^A-Za-z0-9]+")
 	return reg.ReplaceAllString(strings.Join(value, "_"), "_")
 }
-
-var mu = &sync.Mutex{}