From bfdc351a81db31bfd5f98a788bf8dbacc713e495 Mon Sep 17 00:00:00 2001 From: JoaoCxMartins Date: Tue, 23 Jan 2024 12:11:19 +0000 Subject: [PATCH] move the logs to level information --- pkg/engine/inspector.go | 1 + pkg/printer/printer.go | 17 +++++++++-------- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/pkg/engine/inspector.go b/pkg/engine/inspector.go index bf4ecb179a3..cf26def1487 100644 --- a/pkg/engine/inspector.go +++ b/pkg/engine/inspector.go @@ -309,6 +309,7 @@ func (c *Inspector) doRun(ctx *QueryContext) (vulns []model.Vulnerability, err e if r := recover(); r != nil { errMessage := fmt.Sprintf("Recovered from panic during query '%s' run. ", ctx.Query.Metadata.Query) err = fmt.Errorf("panic: %v", r) + fmt.Println() log.Err(err).Msg(errMessage) } }() diff --git a/pkg/printer/printer.go b/pkg/printer/printer.go index 0e0a6c365eb..55210aa9e8b 100644 --- a/pkg/printer/printer.go +++ b/pkg/printer/printer.go @@ -18,7 +18,7 @@ import ( ) const ( - wordWrapCount = 5 + wordWrapCount = 6 charsLimitPerLine = 255 ) @@ -104,17 +104,18 @@ func WordWrap(s, indentation string, limit int) string { // PrintResult prints on output the summary results func PrintResult(summary *model.Summary, failedQueries map[string]error, printer *Printer, usingCustomQueries bool) error { log.Debug().Msg("helpers.PrintResult()") - fmt.Printf("Files scanned: %d\n", summary.ScannedFiles) - fmt.Printf("Parsed files: %d\n", summary.ParsedFiles) - fmt.Printf("Queries loaded: %d\n", summary.TotalQueries) - fmt.Printf("Queries failed to execute: %d\n\n", summary.FailedToExecuteQueries) + if consoleFlags.GetBoolFlag(consoleFlags.VerboseFlag) { + fmt.Printf("\n------------------------------------\n\n") + } + log.Info().Msgf("Queries failed to execute: %d", summary.FailedToExecuteQueries) for queryName, err := range failedQueries { - fmt.Printf("\t- %s:\n", queryName) - fmt.Printf("%s", WordWrap(err.Error(), "\t\t", wordWrapCount)) + log.Info().Msgf("\t- %s:%s", queryName, WordWrap(err.Error(), "\t", wordWrapCount)) + } + if consoleFlags.GetBoolFlag(consoleFlags.VerboseFlag) { + fmt.Printf("------------------------------------\n\n") } - fmt.Printf("------------------------------------\n\n") for index := range summary.Queries { idx := len(summary.Queries) - index - 1 if summary.Queries[idx].Severity == model.SeverityTrace {