Fixes 251. Set debug_write to false by default. Added log output of byte count...

Fixes 251. Set debug_write to false by default. Added log output of byte count when debug is false. Updated tests to match new default

Signed-off-by: Burton Rheutan <rheutan7@gmail.com>

watchdog/config_test.go

@@ -51,40 +51,40 @@ 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)")
+	if config.writeDebug != false {
+		t.Logf("writeDebug should have been false (unspecified)")
 		t.Fail()
 	}
 }
 
-func TestRead_WriteDebug_FalseOverrideConfig(t *testing.T) {
+func TestRead_WriteDebug_TrueOverrideConfig(t *testing.T) {
 	defaults := NewEnvBucket()
 	readConfig := ReadConfig{}
-	defaults.Setenv("write_debug", "false")
+	defaults.Setenv("write_debug", "true")
 
 	config := readConfig.Read(defaults)
 
-	if config.writeDebug != false {
-		t.Logf("writeDebug should have been false (specified)")
+	if config.writeDebug != true {
+		t.Logf("writeDebug should have been true (specified)")
 		t.Fail()
 	}
 }
 
-func TestRead_WriteDebug_TrueConfig(t *testing.T) {
+func TestRead_WriteDebug_FlaseConfig(t *testing.T) {
 	defaults := NewEnvBucket()
 	readConfig := ReadConfig{}
-	defaults.Setenv("write_debug", "true")
+	defaults.Setenv("write_debug", "false")
 
 	config := readConfig.Read(defaults)
 
-	if config.writeDebug != true {
-		t.Logf("writeDebug should have been true (specified)")
+	if config.writeDebug != false {
+		t.Logf("writeDebug should have been false (specified)")
 		t.Fail()
 	}
 }

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 {

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,
 	}