Merge pull request #104 from ingrammicro/master

Master2Develop
ingrammicro · Aug 16, 2022 · fff2c4a · fff2c4a
2 parents 9bc2f41 + c88b288
commit fff2c4a
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/utils/exec.go b/utils/exec.go
@@ -258,7 +258,12 @@ func RunTracedCmd(
 
 // thresholdTime  > 0 continuous report
 // thresholdLines > 0 bootstrapping
-func RunContinuousCmd(fn func(chunk string) error, command string, thresholdTime int, thresholdLines int) (int, error) {
+func RunContinuousCmd(
+	report func(chunk string) error,
+	command string,
+	thresholdTime int,
+	thresholdLines int) (int, error) {
+
 	log.Debug("RunContinuousCmd")
 
 	// Saves script/command in a temp file
@@ -298,7 +303,7 @@ func RunContinuousCmd(fn func(chunk string) error, command string, thresholdTime
 		nLines++
 		nTime = int(time.Since(timeStart).Seconds())
 		if (thresholdTime > 0 && nTime >= thresholdTime) || (thresholdLines > 0 && nLines >= thresholdLines) {
-			if err := fn(chunk); err == nil {
+			if reportErr := report(chunk); reportErr == nil {
 				chunk = ""
 			}
 			nLines, nTime = 0, 0
@@ -313,7 +318,7 @@ func RunContinuousCmd(fn func(chunk string) error, command string, thresholdTime
 
 	if len(chunk) > 0 {
 		log.Debug("Processing the last pending chunk")
-		if err := fn(chunk); err != nil {
+		if err := report(chunk); err != nil {
 			log.Error("Cannot process the last chunk", err.Error())
 		}
 	}

diff --git a/utils/version.go b/utils/version.go
@@ -3,7 +3,7 @@
 package utils
 
 // VERSION sets the current CLI version
-const VERSION = "0.15.0-alpha.1"
+const VERSION = "0.15.0"
 
 // VERSION_API_USER_MODE sets the current IMCO API version for user mode
 const VERSION_API_USER_MODE = "v3"