Clean up loading logs

Author: jdharmon

rules/chaos.go

@@ -42,7 +42,7 @@ func (rule *chaos) load() (bool, string, error) {
 	if rule.chance != 0 {
 		return true, fmt.Sprintf("chaos chance %s", value), nil
 	}
-	return true, fmt.Sprint("chaos loaded explicitly"), nil
+	return true, fmt.Sprint("chaos (no default)"), nil
 }
 
 func (rule *chaos) ShouldReap(pod v1.Pod) (bool, string) {

rules/chaos_test.go

@@ -37,7 +37,7 @@ func TestChaosLoad(t *testing.T) {
 		os.Setenv(envExplicitLoad, ruleChaos)
 		loaded, message, err := (&chaos{}).load()
 		assert.NoError(t, err)
-		assert.Equal(t, "chaos loaded explicitly", message)
+		assert.Equal(t, "chaos (no default)", message)
 		assert.True(t, loaded)
 	})
 }

rules/container_status.go

@@ -33,7 +33,7 @@ func (rule *containerStatus) load() (bool, string, error) {
 	if len(rule.reapStatuses) != 0 {
 		return true, fmt.Sprintf("container status in [%s]", value), nil
 	}
-	return true, "container status loaded explicitly", nil
+	return true, "container status (no default)", nil
 }
 
 func (rule *containerStatus) ShouldReap(pod v1.Pod) (bool, string) {

rules/container_status_test.go

@@ -70,7 +70,7 @@ func TestContainerStatusLoad(t *testing.T) {
 		os.Setenv(envExplicitLoad, containerStatusName)
 		loaded, message, err := (&containerStatus{}).load()
 		assert.NoError(t, err)
-		assert.Equal(t, "container status loaded explicitly", message)
+		assert.Equal(t, "container status (no default)", message)
 		assert.True(t, loaded)
 	})
 }

rules/duration.go

@@ -36,7 +36,7 @@ func (rule *duration) load() (bool, string, error) {
 	if rule.duration != 0 {
 		return true, fmt.Sprintf("maximum run duration %s", value), nil
 	}
-	return true, fmt.Sprint("maximum run duration loaded explicitly"), nil
+	return true, fmt.Sprint("maximum run duration (no default)"), nil
 }
 
 func (rule *duration) ShouldReap(pod v1.Pod) (bool, string) {

rules/duration_test.go

@@ -48,7 +48,7 @@ func TestDurationLoad(t *testing.T) {
 		os.Setenv(envExplicitLoad, ruleDuration)
 		loaded, message, err := (&duration{}).load()
 		assert.NoError(t, err)
-		assert.Equal(t, "maximum run duration loaded explicitly", message)
+		assert.Equal(t, "maximum run duration (no default)", message)
 		assert.True(t, loaded)
 	})
 }

rules/pod_status.go

@@ -33,7 +33,7 @@ func (rule *podStatus) load() (bool, string, error) {
 	if len(rule.reapStatuses) != 0 {
 		return true, fmt.Sprintf("pod status in [%s]", value), nil
 	}
-	return true, "pod status loaded explicitly", nil
+	return true, "pod status (no default)", nil
 }
 
 func (rule *podStatus) ShouldReap(pod v1.Pod) (bool, string) {

rules/pod_status_test.go

@@ -49,7 +49,7 @@ func TestPodStatusLoad(t *testing.T) {
 		os.Setenv(envExplicitLoad, podStatusName)
 		loaded, message, err := (&podStatus{}).load()
 		assert.NoError(t, err)
-		assert.Equal(t, "pod status loaded explicitly", message)
+		assert.Equal(t, "pod status (no default)", message)
 		assert.True(t, loaded)
 	})
 }

rules/unready.go

@@ -36,7 +36,7 @@ func (rule *unready) load() (bool, string, error) {
 	if rule.duration != 0 {
 		return true, fmt.Sprintf("maximum unready %s", value), nil
 	}
-	return true, fmt.Sprint("maximum unready duration loaded explicitly"), nil
+	return true, fmt.Sprint("maximum unready duration (no default)"), nil
 }
 
 func (rule *unready) ShouldReap(pod v1.Pod) (bool, string) {

rules/unready_test.go

@@ -55,7 +55,7 @@ func TestUnreadyLoad(t *testing.T) {
 		os.Setenv(envExplicitLoad, ruleUnready)
 		loaded, message, err := (&unready{}).load()
 		assert.NoError(t, err)
-		assert.Equal(t, "maximum unready duration loaded explicitly", message)
+		assert.Equal(t, "maximum unready duration (no default)", message)
 		assert.True(t, loaded)
 	})
 }