diff --git a/watchdog/config_test.go b/watchdog/config_test.go index 68407c95..f0247425 100644 --- a/watchdog/config_test.go +++ b/watchdog/config_test.go @@ -51,32 +51,19 @@ func TestRead_CgiHeaders_DefaultIsTrueConfig(t *testing.T) { } } -func TestRead_WriteDebug_DefaultIsTrueConfig(t *testing.T) { +func TestRead_WriteDebug_DefaultIsFalseConfig(t *testing.T) { defaults := NewEnvBucket() readConfig := ReadConfig{} config := readConfig.Read(defaults) - if config.writeDebug != true { - t.Logf("writeDebug should have been true (unspecified)") - t.Fail() - } -} - -func TestRead_WriteDebug_FalseOverrideConfig(t *testing.T) { - defaults := NewEnvBucket() - readConfig := ReadConfig{} - defaults.Setenv("write_debug", "false") - - config := readConfig.Read(defaults) - if config.writeDebug != false { - t.Logf("writeDebug should have been false (specified)") + t.Logf("writeDebug should have been false (unspecified)") t.Fail() } } -func TestRead_WriteDebug_TrueConfig(t *testing.T) { +func TestRead_WriteDebug_TrueOverrideConfig(t *testing.T) { defaults := NewEnvBucket() readConfig := ReadConfig{} defaults.Setenv("write_debug", "true") @@ -89,6 +76,19 @@ func TestRead_WriteDebug_TrueConfig(t *testing.T) { } } +func TestRead_WriteDebug_FlaseConfig(t *testing.T) { + defaults := NewEnvBucket() + readConfig := ReadConfig{} + defaults.Setenv("write_debug", "false") + + config := readConfig.Read(defaults) + + if config.writeDebug != false { + t.Logf("writeDebug should have been false (specified)") + t.Fail() + } +} + func TestRead_SuppressLockConfig(t *testing.T) { defaults := NewEnvBucket() readConfig := ReadConfig{} diff --git a/watchdog/main.go b/watchdog/main.go index 46e8af6f..d10b00e5 100644 --- a/watchdog/main.go +++ b/watchdog/main.go @@ -145,6 +145,8 @@ func pipeRequest(config *WatchdogConfig, w http.ResponseWriter, r *http.Request, if config.writeDebug == true { log.Printf("Success=%t, Error=%s\n", targetCmd.ProcessState.Success(), err.Error()) log.Printf("Out=%s\n", out) + } else { + log.Printf("An Error Occurred\n") } if ri.headerWritten == false { @@ -162,6 +164,8 @@ func pipeRequest(config *WatchdogConfig, w http.ResponseWriter, r *http.Request, if config.writeDebug == true { os.Stdout.Write(out) + } else { + log.Printf("Wrote %d Bytes\n", len(out)) } if len(config.contentType) > 0 { diff --git a/watchdog/readconfig.go b/watchdog/readconfig.go index ea119891..a4d0048f 100644 --- a/watchdog/readconfig.go +++ b/watchdog/readconfig.go @@ -43,7 +43,7 @@ func parseIntValue(val string) int { // Read fetches config from environmental variables. func (ReadConfig) Read(hasEnv HasEnv) WatchdogConfig { cfg := WatchdogConfig{ - writeDebug: true, + writeDebug: false, cgiHeaders: true, }