Debugging

Author: vfarcic

haproxy.tmpl

@@ -5,9 +5,7 @@ global
 defaults
     mode    http
     balance roundrobin
-
-    option  dontlognull
-    option  dontlog-normal
+    {{.ExtraDefaults}}
     option  http-server-close
     option  forwardfor
     option  redispatch

proxy/ha_proxy.go

@@ -29,6 +29,7 @@ type ConfigData struct {
 	StatsPass            string
 	UserList             string
 	ExtraGlobal          string
+	ExtraDefaults        string
 }
 
 func NewHaProxy(templatesPath, configsPath string, certs map[string]bool) Proxy {
@@ -196,6 +197,10 @@ func (m HaProxy) getConfigData() ConfigData {
 	if strings.EqualFold(os.Getenv("DEBUG"), "true") {
 		d.ExtraGlobal += `
     debug`
+	} else {
+		d.ExtraDefaults += `
+    option  dontlognull
+    option  dontlog-normal`
 	}
 	return d
 }

proxy/ha_proxy_test.go

@@ -176,9 +176,11 @@ func (s HaProxyTestSuite) Test_CreateConfigFromTemplates_AddsDebug() {
 	defer func() { os.Setenv("DEBUG", debugOrig) }()
 	os.Setenv("DEBUG", "true")
 	var actualData string
+	tmpl := strings.Replace(s.TemplateContent, "tune.ssl.default-dh-param 2048", "tune.ssl.default-dh-param 2048\n    debug", -1)
+	tmpl = strings.Replace(tmpl,"    option  dontlognull\n    option  dontlog-normal\n", "", -1)
 	expectedData := fmt.Sprintf(
 		"%s%s",
-		strings.Replace(s.TemplateContent, "tune.ssl.default-dh-param 2048", "tune.ssl.default-dh-param 2048\n    debug", -1),
+		tmpl,
 		s.ServicesContent,
 	)
 	writeFile = func(filename string, data []byte, perm os.FileMode) error {

proxy/test_configs/tmpl/haproxy.tmpl

@@ -5,9 +5,7 @@ global
 defaults
     mode    http
     balance roundrobin
-
-    option  dontlognull
-    option  dontlog-normal
+{{.ExtraDefaults}}
     option  http-server-close
     option  forwardfor
     option  redispatch