Merge branch 'master' into AST-67161-Add-Score-System

Checkmarx · Nov 26, 2024 · 3f05b72 · 3f05b72
2 parents f4814ed + f5a5cb4
commit 3f05b72
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/cmd/exit_handler.go b/cmd/exit_handler.go
@@ -1,6 +1,7 @@
 package cmd
 
 import (
+	"github.com/rs/zerolog/log"
 	"os"
 )
 
@@ -27,6 +28,7 @@ func isNeedReturnErrorCodeFor(kind ignoreOnExit) bool {
 
 func exitCodeIfError(err error) int {
 	if err != nil && isNeedReturnErrorCodeFor("errors") {
+		log.Error().Err(err).Msg("Failed to run 2ms")
 		return errorCode
 	}
 

diff --git a/lib/utils/logger.go b/lib/utils/logger.go
@@ -24,18 +24,17 @@ func (w SpecificLevelWriter) WriteLevel(level zerolog.Level, p []byte) (int, err
 func CreateLogger(minimumLevel zerolog.Level) zerolog.Logger {
 	writer := zerolog.MultiLevelWriter(
 		SpecificLevelWriter{
-			Writer: zerolog.ConsoleWriter{Out: os.Stdout, TimeFormat: "15:04:05"},
+			Writer: zerolog.ConsoleWriter{Out: os.Stdout, TimeFormat: "15:04:05", NoColor: true},
 			Levels: []zerolog.Level{
 				zerolog.DebugLevel, zerolog.InfoLevel, zerolog.WarnLevel,
 			},
 		},
 		SpecificLevelWriter{
-			Writer: zerolog.ConsoleWriter{Out: os.Stderr, TimeFormat: "15:04:05"},
+			Writer: zerolog.ConsoleWriter{Out: os.Stderr, TimeFormat: "15:04:05", NoColor: true},
 			Levels: []zerolog.Level{
 				zerolog.ErrorLevel, zerolog.FatalLevel, zerolog.PanicLevel,
 			},
 		},
 	)
-
 	return zerolog.New(writer).Level(minimumLevel).With().Timestamp().Logger()
 }
diff --git a/plugins/filesystem.go b/plugins/filesystem.go
@@ -5,6 +5,7 @@ import (
 	"os"
 	"path/filepath"
 	"sync"
+	"time"
 
 	"github.com/rs/zerolog/log"
 	"github.com/spf13/cobra"
@@ -93,6 +94,7 @@ func (p *FileSystemPlugin) getFiles(items chan ISourceItem, errs chan error, wg
 
 	if err != nil {
 		errs <- fmt.Errorf("error while walking through the directory: %w", err)
+		time.Sleep(time.Second) // Temporary fix for incorrect non-error exits; needs a better solution.
 		return
 	}
 
@@ -107,6 +109,7 @@ func (p *FileSystemPlugin) getItems(items chan ISourceItem, errs chan error, wg
 			actualFile, err := p.getItem(filePath)
 			if err != nil {
 				errs <- err
+				time.Sleep(time.Second) // Temporary fix for incorrect non-error exits; needs a better solution.
 				return
 			}
 			items <- *actualFile