[check-procs] change function name

hurrycaine · Aug 9, 2019 · ba752fb · ba752fb
1 parent 843e7b4
commit ba752fb
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 11 deletions.
diff --git a/check-procs/lib/check_procs.go b/check-procs/lib/check_procs.go
@@ -105,7 +105,7 @@ func run(args []string) *checkers.Checker {
 			}
 		}
 		count := int64(len(resultrocStates))
-		result = optimizeStatus(count, result)
+		result = mergeStatus(count, result)
 		msg += fmt.Sprintf("\n%s", gatherMsg(count, reg.String()))
 
 		resultrocStates = []procState{}
@@ -180,7 +180,7 @@ func gatherMsg(count int64, pattern string) string {
 	return msg
 }
 
-func optimizeStatus(count int64, current checkers.Status) checkers.Status {
+func mergeStatus(count int64, current checkers.Status) checkers.Status {
 	result := checkers.OK
 	if opts.CritUnder != 0 && count < opts.CritUnder ||
 		opts.CritOver != nil && count > *opts.CritOver {

diff --git a/check-procs/lib/check_procs_test.go b/check-procs/lib/check_procs_test.go
@@ -48,7 +48,7 @@ func TestProcs(t *testing.T) {
 	}
 }
 
-func TestOptimizeStatus(t *testing.T) {
+func TestMergeStatus(t *testing.T) {
 	var CritOver int64 = 100
 	var WarningOver int64 = 80
 	var WarningUnder int64 = 40
@@ -59,14 +59,14 @@ func TestOptimizeStatus(t *testing.T) {
 	opts.WarningUnder = WarningUnder
 	opts.CritUnder = CritUnder
 
-	assert.Equal(t, checkers.OK, optimizeStatus(80, checkers.OK))
-	assert.Equal(t, checkers.WARNING, optimizeStatus(81, checkers.OK))
-	assert.Equal(t, checkers.WARNING, optimizeStatus(100, checkers.OK))
-	assert.Equal(t, checkers.CRITICAL, optimizeStatus(101, checkers.OK))
-	assert.Equal(t, checkers.OK, optimizeStatus(40, checkers.OK))
-	assert.Equal(t, checkers.WARNING, optimizeStatus(39, checkers.OK))
-	assert.Equal(t, checkers.WARNING, optimizeStatus(10, checkers.OK))
-	assert.Equal(t, checkers.CRITICAL, optimizeStatus(9, checkers.OK))
+	assert.Equal(t, checkers.OK, mergeStatus(80, checkers.OK))
+	assert.Equal(t, checkers.WARNING, mergeStatus(81, checkers.OK))
+	assert.Equal(t, checkers.WARNING, mergeStatus(100, checkers.OK))
+	assert.Equal(t, checkers.CRITICAL, mergeStatus(101, checkers.OK))
+	assert.Equal(t, checkers.OK, mergeStatus(40, checkers.OK))
+	assert.Equal(t, checkers.WARNING, mergeStatus(39, checkers.OK))
+	assert.Equal(t, checkers.WARNING, mergeStatus(10, checkers.OK))
+	assert.Equal(t, checkers.CRITICAL, mergeStatus(9, checkers.OK))
 }
 
 func TestGatherMsg(t *testing.T) {