From 90cceb9b2da268d8f927578d0426b7305007792e Mon Sep 17 00:00:00 2001
From: zikcheng <zik@littlelights.ai>
Date: Tue, 30 Aug 2022 18:56:19 +0800
Subject: [PATCH] expose SugaredLogger loosely-typed structured logging

---
 README_zh.md | 12 ++++++------
 logger.go    | 30 ++++++++++++++++++++++++++++++
 sugar.go     | 30 ++++++++++++++++++++++++++++++
 3 files changed, 66 insertions(+), 6 deletions(-)

diff --git a/README_zh.md b/README_zh.md
index cc18ac1..c416dde 100644
--- a/README_zh.md
+++ b/README_zh.md
@@ -19,12 +19,12 @@ Sugar 封装了 [zap](https://github.com/uber-go/zap) 日志库，让开发者
 
 Sugar 封装了 sugared-zap 的所有方法，如下（如果有疏漏，可以提 issue 通知我）：
 
-* Debug/Debugf
-* Info/Infof
-* Warn/Warnf
-* Error/Errorf
-* Fatal/Fatalf
-* Panic/Panicf
+* Debug/Debugf/Debugw
+* Info/Infof/Infow
+* Warn/Warnf/Warnw
+* Error/Errorf/Errorw
+* Fatal/Fatalf/Fatalw
+* Panic/Panicf/Panicw
 
 
 ## logs 格式预先看
diff --git a/logger.go b/logger.go
index 11cecfb..7ff2048 100644
--- a/logger.go
+++ b/logger.go
@@ -36,6 +36,11 @@ func (l *Logger) Debugf(template string, args ...interface{}) {
 	l.zapSugar.Debugf(template, args...)
 }
 
+// Debugw package sugar of zap
+func (l *Logger) Debugw(msg string, keysAndValues ...interface{}) {
+	l.zapSugar.Debugw(msg, keysAndValues...)
+}
+
 // Info package sugar of zap
 func (l *Logger) Info(args ...interface{}) {
 	l.zapSugar.Info(args...)
@@ -46,6 +51,11 @@ func (l *Logger) Infof(template string, args ...interface{}) {
 	l.zapSugar.Infof(template, args...)
 }
 
+// Infow package sugar of zap
+func (l *Logger) Infow(msg string, keysAndValues ...interface{}) {
+	l.zapSugar.Infow(msg, keysAndValues...)
+}
+
 // Warn package sugar of zap
 func (l *Logger) Warn(args ...interface{}) {
 	l.zapSugar.Warn(args...)
@@ -56,6 +66,11 @@ func (l *Logger) Warnf(template string, args ...interface{}) {
 	l.zapSugar.Warnf(template, args...)
 }
 
+// Warnw package sugar of zap
+func (l *Logger) Warnw(msg string, keysAndValues ...interface{}) {
+	l.zapSugar.Warnw(msg, keysAndValues...)
+}
+
 // Error package sugar of zap
 func (l *Logger) Error(args ...interface{}) {
 	l.zapSugar.Error(args...)
@@ -66,6 +81,11 @@ func (l *Logger) Errorf(template string, args ...interface{}) {
 	l.zapSugar.Errorf(template, args...)
 }
 
+// Errorw package sugar of zap
+func (l *Logger) Errorw(msg string, keysAndValues ...interface{}) {
+	l.zapSugar.Errorw(msg, keysAndValues...)
+}
+
 // Fatal package sugar of zap
 func (l *Logger) Fatal(args ...interface{}) {
 	l.zapSugar.Fatal(args...)
@@ -76,6 +96,11 @@ func (l *Logger) Fatalf(template string, args ...interface{}) {
 	l.zapSugar.Fatalf(template, args...)
 }
 
+// Fatalw package sugar of zap
+func (l *Logger) Fatalw(msg string, keysAndValues ...interface{}) {
+	l.zapSugar.Fatalw(msg, keysAndValues...)
+}
+
 // Panic package sugar of zap
 func (l *Logger) Panic(args ...interface{}) {
 	l.zapSugar.Panic(args...)
@@ -85,3 +110,8 @@ func (l *Logger) Panic(args ...interface{}) {
 func (l *Logger) Panicf(template string, args ...interface{}) {
 	l.zapSugar.Panicf(template, args...)
 }
+
+// Panicw package sugar of zap
+func (l *Logger) Panicw(msg string, keysAndValues ...interface{}) {
+	l.zapSugar.Panicw(msg, keysAndValues...)
+}
diff --git a/sugar.go b/sugar.go
index 57553b7..0799f55 100644
--- a/sugar.go
+++ b/sugar.go
@@ -10,6 +10,11 @@ func Debugf(template string, args ...interface{}) {
 	mainLogger.zapSugar.Debugf(template, args...)
 }
 
+// Debugw package mainLogger
+func Debugw(msg string, keysAndValues ...interface{}) {
+	mainLogger.zapSugar.Debugw(msg, keysAndValues...)
+}
+
 // Info package mainLogger
 func Info(args ...interface{}) {
 	mainLogger.zapSugar.Info(args...)
@@ -20,6 +25,11 @@ func Infof(template string, args ...interface{}) {
 	mainLogger.zapSugar.Infof(template, args...)
 }
 
+// Infow package mainLogger
+func Infow(msg string, keysAndValues ...interface{}) {
+	mainLogger.zapSugar.Infow(msg, keysAndValues...)
+}
+
 // Warn package mainLogger
 func Warn(args ...interface{}) {
 	mainLogger.zapSugar.Warn(args...)
@@ -30,6 +40,11 @@ func Warnf(template string, args ...interface{}) {
 	mainLogger.zapSugar.Warnf(template, args...)
 }
 
+// Warnw package mainLogger
+func Warnw(msg string, keysAndValues ...interface{}) {
+	mainLogger.zapSugar.Warnw(msg, keysAndValues...)
+}
+
 // Error package mainLogger
 func Error(args ...interface{}) {
 	mainLogger.zapSugar.Error(args...)
@@ -40,6 +55,11 @@ func Errorf(template string, args ...interface{}) {
 	mainLogger.zapSugar.Errorf(template, args...)
 }
 
+// Errorw package mainLogger
+func Errorw(msg string, keysAndValues ...interface{}) {
+	mainLogger.zapSugar.Errorw(msg, keysAndValues...)
+}
+
 // Fatal package mainLogger
 func Fatal(args ...interface{}) {
 	mainLogger.zapSugar.Fatal(args...)
@@ -50,6 +70,11 @@ func Fatalf(template string, args ...interface{}) {
 	mainLogger.zapSugar.Fatalf(template, args...)
 }
 
+// Fatalw package mainLogger
+func Fatalw(msg string, keysAndValues ...interface{}) {
+	mainLogger.zapSugar.Fatalw(msg, keysAndValues...)
+}
+
 // Panic package mainLogger
 func Panic(args ...interface{}) {
 	mainLogger.zapSugar.Panic(args...)
@@ -59,3 +84,8 @@ func Panic(args ...interface{}) {
 func Panicf(template string, args ...interface{}) {
 	mainLogger.zapSugar.Panicf(template, args...)
 }
+
+// Panicw package mainLogger
+func Panicw(msg string, keysAndValues ...interface{}) {
+	mainLogger.zapSugar.Panicw(msg, keysAndValues...)
+}