From 094f547e7adb2d1c92d32c71dfa610f6fa3997dc Mon Sep 17 00:00:00 2001 From: Julian Strobl Date: Tue, 9 Jan 2024 16:55:33 +0100 Subject: [PATCH] fix: app logger formatting (#265) From this: ``` ERR [app] reissue: failed. valid result: %v proposer: %s validator identity: %s module=server ``` to this: ``` ERR [app] reissue: failed. valid result: true proposer: 9d3b2072f96f9481de983700605fbcd9158d5b63 validator identity: 31615187759d4bdb1c43ea7e7b9be91066042fbf module=server ``` Signed-off-by: Julian Strobl --- util/logger.go | 30 +++++++++++++++++++----------- 1 file changed, 19 insertions(+), 11 deletions(-) diff --git a/util/logger.go b/util/logger.go index cfa12b5..4070468 100644 --- a/util/logger.go +++ b/util/logger.go @@ -1,6 +1,7 @@ package util import ( + "fmt" "sync" "testing" @@ -36,28 +37,35 @@ func (logger *AppLogger) SetTestingLogger(testingLogger *testing.T) *AppLogger { return logger } +func format(msg string, keyvals ...interface{}) string { + if len(keyvals) == 0 { + return msg + } + return fmt.Sprintf(msg, keyvals...) +} + func (logger *AppLogger) testingLog(msg string, keyvals ...interface{}) { if logger.testingLogger == nil { return } - if len(keyvals) == 0 { - logger.testingLogger.Log(msg) - return - } - logger.testingLogger.Logf(msg, keyvals...) + msg = format(msg, keyvals...) + logger.testingLogger.Logf(msg) } func (logger *AppLogger) Info(ctx sdk.Context, msg string, keyvals ...interface{}) { - logger.testingLog(globalApplicationLoggerTag+msg, keyvals...) - ctx.Logger().Info(globalApplicationLoggerTag+msg, keyvals...) + msg = format(msg, keyvals...) + logger.testingLog(globalApplicationLoggerTag + msg) + ctx.Logger().Info(globalApplicationLoggerTag + msg) } func (logger *AppLogger) Debug(ctx sdk.Context, msg string, keyvals ...interface{}) { - logger.testingLog(globalApplicationLoggerTag+msg, keyvals...) - ctx.Logger().Debug(globalApplicationLoggerTag+msg, keyvals...) + msg = format(msg, keyvals...) + logger.testingLog(globalApplicationLoggerTag + msg) + ctx.Logger().Debug(globalApplicationLoggerTag + msg) } func (logger *AppLogger) Error(ctx sdk.Context, msg string, keyvals ...interface{}) { - logger.testingLog(globalApplicationLoggerTag+msg, keyvals...) - ctx.Logger().Error(globalApplicationLoggerTag+msg, keyvals...) + msg = format(msg, keyvals...) + logger.testingLog(globalApplicationLoggerTag + msg) + ctx.Logger().Error(globalApplicationLoggerTag + msg) }