]> go.fuhry.dev Git - runtime.git/commitdiff
[utils/log] fix prepending prefix to FATAL messages
authorDan Fuhry <dan@fuhry.com>
Fri, 21 Nov 2025 00:36:50 +0000 (19:36 -0500)
committerDan Fuhry <dan@fuhry.com>
Fri, 21 Nov 2025 00:36:50 +0000 (19:36 -0500)
utils/log/log.go

index 72e8894db872b17fd52de4ff32ba004abaa6abbc..cdab8176e6f89d3b2b0563583307733995ee296a 100644 (file)
@@ -202,10 +202,15 @@ func (l *internalLogger) prependPrefixes(v []any) []any {
 
 func (l *internalLogger) Fatal(v ...any) {
        if len(v) > 0 {
+               if err, ok := v[0].(error); ok {
+                       v[0] = err.Error()
+               }
+
                if arg1, ok := v[0].(string); ok {
                        if l.prefix != "" {
-                               v[0] = FATAL.prefix(l.Writer()) + "[" + l.prefix + "] " + arg1
+                               arg1 = "[" + l.prefix + "] " + arg1
                        }
+                       v[0] = FATAL.prefix(l.Writer()) + arg1
                }
        }
 
@@ -214,10 +219,10 @@ func (l *internalLogger) Fatal(v ...any) {
 
 func (l *internalLogger) Fatalf(fmtstr string, v ...any) {
        if l.prefix != "" {
-               fmtstr = FATAL.prefix(l.Writer()) + "[" + l.prefix + "] " + fmtstr
+               fmtstr = "[" + l.prefix + "] " + fmtstr
        }
 
-       l.Logger.Fatalf(fmtstr, v...)
+       l.Logger.Fatalf(FATAL.prefix(l.Writer())+fmtstr, v...)
 }
 
 func (l *internalLogger) NewWriter(lv Level) io.Writer {