Refactor debug output for logger

evg4b · Jun 1, 2023 · 8f0de5e · 8f0de5e
1 parent 1804163
commit 8f0de5e
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 10 deletions.
diff --git a/internal/log/log.go b/internal/log/log.go
@@ -1,18 +1,11 @@
 package log
 
 import (
-	"io"
-	"os"
-
 	"github.com/evg4b/uncors/internal/sfmt"
 	"github.com/pterm/pterm"
+	"io"
 )
 
-func Fatal(a ...any) {
-	Error(a...)
-	os.Exit(0)
-}
-
 func Error(a ...any) {
 	errorPrinter.Println(a...)
 }

diff --git a/internal/log/logger.go b/internal/log/logger.go
@@ -8,6 +8,7 @@ import (
 
 type PrefixedLogger struct {
 	writer *pterm.PrefixPrinter
+	debug  *pterm.PrefixPrinter
 }
 
 func NewLogger(name string, options ...LoggerOption) *PrefixedLogger {
@@ -19,6 +20,14 @@ func NewLogger(name string, options ...LoggerOption) *PrefixedLogger {
 				Text:  name,
 			},
 		},
+		debug: &pterm.PrefixPrinter{
+			MessageStyle: &pterm.ThemeDefault.DebugMessageStyle,
+			Prefix: pterm.Prefix{
+				Text:  name,
+				Style: &pterm.ThemeDefault.DebugPrefixStyle,
+			},
+			Debugger: true,
+		},
 	}
 
 	for _, option := range options {
@@ -54,13 +63,13 @@ func (logger *PrefixedLogger) Infof(template string, v ...any) {
 
 func (logger *PrefixedLogger) Debug(v ...any) {
 	if pterm.PrintDebugMessages {
-		logger.writer.Println(debugPrinter.Sprint(v...))
+		logger.debug.Println(debugPrinter.Sprint(v...))
 	}
 }
 
 func (logger *PrefixedLogger) Debugf(template string, v ...any) {
 	if pterm.PrintDebugMessages {
-		logger.writer.Println(debugPrinter.Sprintf(template, v...))
+		logger.debug.Println(debugPrinter.Sprintf(template, v...))
 	}
 }
 

diff --git a/internal/log/options.go b/internal/log/options.go
@@ -11,6 +11,7 @@ type LoggerOption = func(logger *PrefixedLogger)
 func WithOutput(writer io.Writer) LoggerOption {
 	return func(logger *PrefixedLogger) {
 		logger.writer.Writer = writer
+		logger.debug.Writer = writer
 	}
 }