Skip to content

Commit a79a434

Browse files
ycdengdengyucheng
ycdeng
and
dengyucheng
authored
recover log module (finogeeks#33)
* recover log module * recover log module Co-authored-by: dengyucheng <[email protected]>
1 parent 42cda5e commit a79a434

File tree

6 files changed

+588
-2
lines changed

6 files changed

+588
-2
lines changed

‎federation/.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
/federation

‎go.mod

-2
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@ require (
1515
github.com/json-iterator/go v1.1.9
1616
github.com/lib/pq v1.5.2
1717
github.com/minio/blake2b-simd v0.0.0-20160723061019-3f5f724cb5b1
18-
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
19-
github.com/modern-go/reflect2 v1.0.1 // indirect
2018
github.com/nats-io/gnatsd v1.4.1 // indirect
2119
github.com/nats-io/go-nats v1.7.2
2220
github.com/nats-io/nkeys v0.1.4 // indirect

‎skunkworks/log/log.go

+280
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,280 @@
1+
package log
2+
3+
import (
4+
deflog "log"
5+
)
6+
7+
type KeysAndValues []interface{}
8+
9+
type LogConfig struct {
10+
Level string
11+
Files []string
12+
Underlying string
13+
WriteToStdout bool
14+
ZapConfig struct {
15+
MaxSize int
16+
MaxBackups int
17+
MaxAge int
18+
LocalTime bool
19+
Compress bool
20+
JsonFormat bool
21+
BtEnabled bool
22+
BtLevel string
23+
FieldSeparator string
24+
}
25+
}
26+
27+
var logger Logger
28+
29+
func Setup(cfg *LogConfig) {
30+
switch cfg.Underlying {
31+
case "zap":
32+
logger = newZapLogger(cfg)
33+
default:
34+
logger = newZapLogger(cfg)
35+
}
36+
}
37+
38+
func Print(args ...interface{}) {
39+
Info(args...)
40+
}
41+
42+
func Printf(template string, args ...interface{}) {
43+
Infof(template, args...)
44+
}
45+
46+
func Println(args ...interface{}) {
47+
Infoln(args...)
48+
}
49+
50+
func Printw(msg string, kv KeysAndValues) {
51+
if logger != nil {
52+
logger.Infow(msg, kv)
53+
} else {
54+
deflog.Print(msg)
55+
}
56+
}
57+
58+
func Debug(args ...interface{}) {
59+
if logger != nil {
60+
logger.Debug(args...)
61+
} else {
62+
deflog.Print(args...)
63+
}
64+
}
65+
66+
func Debugf(template string, args ...interface{}) {
67+
if logger != nil {
68+
logger.Debugf(template, args...)
69+
} else {
70+
deflog.Printf(template, args...)
71+
}
72+
}
73+
74+
func Debugln(args ...interface{}) {
75+
if logger != nil {
76+
logger.Debugln(args...)
77+
} else {
78+
deflog.Println(args...)
79+
}
80+
}
81+
82+
func Debugw(msg string, kv KeysAndValues) {
83+
if logger != nil {
84+
logger.Debugw(msg, kv)
85+
} else {
86+
deflog.Print(msg, kv)
87+
}
88+
}
89+
90+
func Info(args ...interface{}) {
91+
if logger != nil {
92+
logger.Info(args...)
93+
} else {
94+
deflog.Print(args...)
95+
}
96+
}
97+
98+
func Infof(template string, args ...interface{}) {
99+
if logger != nil {
100+
logger.Infof(template, args...)
101+
} else {
102+
deflog.Printf(template, args...)
103+
}
104+
}
105+
106+
func Infoln(args ...interface{}) {
107+
if logger != nil {
108+
logger.Infoln(args...)
109+
} else {
110+
deflog.Println(args...)
111+
}
112+
}
113+
114+
func Infow(msg string, kv KeysAndValues) {
115+
if logger != nil {
116+
logger.Infow(msg, kv)
117+
} else {
118+
deflog.Print(msg, kv)
119+
}
120+
}
121+
122+
func Warn(args ...interface{}) {
123+
if logger != nil {
124+
logger.Warn(args...)
125+
} else {
126+
deflog.Print(args...)
127+
}
128+
}
129+
130+
func Warnf(template string, args ...interface{}) {
131+
if logger != nil {
132+
logger.Warnf(template, args...)
133+
} else {
134+
deflog.Printf(template, args...)
135+
}
136+
}
137+
138+
func Warnln(args ...interface{}) {
139+
if logger != nil {
140+
logger.Warnln(args...)
141+
} else {
142+
deflog.Println(args...)
143+
}
144+
}
145+
146+
func Warnw(msg string, kv KeysAndValues) {
147+
if logger != nil {
148+
logger.Warnw(msg, kv)
149+
} else {
150+
deflog.Print(msg, kv)
151+
}
152+
}
153+
154+
func Error(args ...interface{}) {
155+
if logger != nil {
156+
logger.Error(args...)
157+
} else {
158+
deflog.Print(args...)
159+
}
160+
}
161+
162+
func Errorf(template string, args ...interface{}) {
163+
if logger != nil {
164+
logger.Errorf(template, args...)
165+
} else {
166+
deflog.Printf(template, args...)
167+
}
168+
}
169+
170+
func Errorln(args ...interface{}) {
171+
if logger != nil {
172+
logger.Errorln(args...)
173+
} else {
174+
deflog.Println(args...)
175+
}
176+
}
177+
178+
func Errorw(msg string, kv KeysAndValues) {
179+
if logger != nil {
180+
logger.Errorw(msg, kv)
181+
} else {
182+
deflog.Print(msg, kv)
183+
}
184+
}
185+
186+
func DPanic(args ...interface{}) {
187+
if logger != nil {
188+
logger.DPanic(args...)
189+
} else {
190+
deflog.Panic(args...)
191+
}
192+
}
193+
194+
func DPanicf(template string, args ...interface{}) {
195+
if logger != nil {
196+
logger.DPanicf(template, args...)
197+
} else {
198+
deflog.Panicf(template, args...)
199+
}
200+
}
201+
202+
func DPanicln(args ...interface{}) {
203+
if logger != nil {
204+
logger.DPanicln(args...)
205+
} else {
206+
deflog.Panicln(args...)
207+
}
208+
}
209+
210+
func DPanicw(msg string, kv KeysAndValues) {
211+
if logger != nil {
212+
logger.DPanicw(msg, kv)
213+
} else {
214+
deflog.Panic(msg, kv)
215+
}
216+
}
217+
218+
func Panic(args ...interface{}) {
219+
if logger != nil {
220+
logger.Panic(args...)
221+
} else {
222+
deflog.Panic(args...)
223+
}
224+
}
225+
226+
func Panicf(template string, args ...interface{}) {
227+
if logger != nil {
228+
logger.Panicf(template, args...)
229+
} else {
230+
deflog.Panicf(template, args...)
231+
}
232+
}
233+
234+
func Panicln(args ...interface{}) {
235+
if logger != nil {
236+
logger.Panicln(args...)
237+
} else {
238+
deflog.Panicln(args...)
239+
}
240+
}
241+
242+
func Panicw(msg string, kv KeysAndValues) {
243+
if logger != nil {
244+
logger.Panicw(msg, kv)
245+
} else {
246+
deflog.Panic(msg, kv)
247+
}
248+
}
249+
250+
func Fatal(args ...interface{}) {
251+
if logger != nil {
252+
logger.Fatal(args...)
253+
} else {
254+
deflog.Fatal(args...)
255+
}
256+
}
257+
258+
func Fatalf(template string, args ...interface{}) {
259+
if logger != nil {
260+
logger.Fatalf(template, args...)
261+
} else {
262+
deflog.Fatalf(template, args...)
263+
}
264+
}
265+
266+
func Fatalln(args ...interface{}) {
267+
if logger != nil {
268+
logger.Fatalln(args...)
269+
} else {
270+
deflog.Fatalln(args...)
271+
}
272+
}
273+
274+
func Fatalw(msg string, kv KeysAndValues) {
275+
if logger != nil {
276+
logger.Fatalw(msg, kv)
277+
} else {
278+
deflog.Fatal(msg, kv)
279+
}
280+
}

‎skunkworks/log/log_test.go

+56
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
// Unfinished test
2+
package log
3+
4+
import (
5+
"testing"
6+
)
7+
8+
func TestDefaultCfg(t *testing.T) {
9+
cfg := LogConfig{
10+
Level: "info",
11+
Files: []string{"./test.log"},
12+
Underlying: "zap",
13+
}
14+
cfg.ZapConfig.MaxSize = 100
15+
cfg.ZapConfig.MaxBackups = 0
16+
cfg.ZapConfig.MaxAge = 0
17+
cfg.ZapConfig.LocalTime = true
18+
cfg.ZapConfig.Compress = true
19+
cfg.ZapConfig.JsonFormat = false
20+
cfg.ZapConfig.BtEnabled = true
21+
cfg.ZapConfig.BtLevel = "error"
22+
Setup(&cfg)
23+
24+
Debug("debug msg", 33, "33")
25+
Debugf("debug msg %d %s", 33, "33")
26+
Debugln("debug msg", 33, "33")
27+
Debugw("debug msg", KeysAndValues{"33", 44, "55", 66})
28+
Print("print msg", 33, "33")
29+
Printf("print msg %d %s", 33, "33")
30+
Println("print msg", 33, "33")
31+
Printw("print msg", KeysAndValues{"33", 44, "55", 66})
32+
Info("info msg", 33, "33")
33+
Infof("info msg %d %s", 33, "33")
34+
Infoln("info msg", 33, "33")
35+
Infow("info msg", KeysAndValues{"33", 44, "55", 66})
36+
Warn("warn msg", 33, "33")
37+
Warnf("warn msg %d %s", 33, "33")
38+
Warnln("warn msg", 33, "33")
39+
Warnw("warn msg", KeysAndValues{"33", 44, "55", 66})
40+
Error("error msg", 33, "33")
41+
Errorf("error msg %d %s", 33, "33")
42+
Errorln("error msg", 33, "33")
43+
Errorw("error msg", KeysAndValues{"33", 44, "55", 66})
44+
DPanic("dpanic msg", 33, "33")
45+
DPanicf("dpanic msg %d %s", 33, "33")
46+
DPanicln("dpanic msg", 33, "33")
47+
DPanicw("dpanic msg", KeysAndValues{"33", 44, "55", 66})
48+
Panic("panic msg", 33, "33")
49+
Panicf("panic msg %d %s", 33, "33")
50+
Panicln("panic msg", 33, "33")
51+
Panicw("panic msg", KeysAndValues{"33", 44, "55", 66})
52+
Fatal("fatal msg", 33, "33")
53+
Fatalf("fatal msg %d %s", 33, "33")
54+
Fatalln("fatal msg", 33, "33")
55+
Fatalw("fatal msg", KeysAndValues{"33", 44, "55", 66})
56+
}

‎skunkworks/log/logger.go

+32
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
package log
2+
3+
type Logger interface {
4+
Debug(args ...interface{})
5+
Debugf(template string, args ...interface{})
6+
Debugln(args ...interface{})
7+
Debugw(msg string, kv KeysAndValues)
8+
Info(args ...interface{})
9+
Infof(template string, args ...interface{})
10+
Infoln(args ...interface{})
11+
Infow(msg string, kv KeysAndValues)
12+
Warn(args ...interface{})
13+
Warnf(template string, args ...interface{})
14+
Warnln(args ...interface{})
15+
Warnw(msg string, kv KeysAndValues)
16+
Error(args ...interface{})
17+
Errorf(template string, args ...interface{})
18+
Errorln(args ...interface{})
19+
Errorw(msg string, kv KeysAndValues)
20+
DPanic(args ...interface{})
21+
DPanicf(template string, args ...interface{})
22+
DPanicln(args ...interface{})
23+
DPanicw(msg string, kv KeysAndValues)
24+
Panic(args ...interface{})
25+
Panicf(template string, args ...interface{})
26+
Panicln(args ...interface{})
27+
Panicw(msg string, kv KeysAndValues)
28+
Fatal(args ...interface{})
29+
Fatalf(template string, args ...interface{})
30+
Fatalln(args ...interface{})
31+
Fatalw(msg string, kv KeysAndValues)
32+
}

0 commit comments

Comments
 (0)