@@ -37,11 +37,10 @@ type (
37
37
)
38
38
39
39
const (
40
- DEBUG Lvl = iota
40
+ DEBUG Lvl = iota + 1
41
41
INFO
42
42
WARN
43
43
ERROR
44
- FATAL
45
44
OFF
46
45
)
47
46
@@ -70,11 +69,11 @@ func New(prefix string) (l *Logger) {
70
69
71
70
func (l * Logger ) initLevels () {
72
71
l .levels = []string {
72
+ "-" ,
73
73
l .color .Blue ("DEBUG" ),
74
74
l .color .Green ("INFO" ),
75
75
l .color .Yellow ("WARN" ),
76
76
l .color .Red ("ERROR" ),
77
- l .color .RedBg ("FATAL" ),
78
77
}
79
78
}
80
79
@@ -128,15 +127,16 @@ func (l *Logger) SetHeader(h string) {
128
127
}
129
128
130
129
func (l * Logger ) Print (i ... interface {}) {
131
- fmt .Fprintln (l .output , i ... )
130
+ l .log (0 , "" , i ... )
131
+ // fmt.Fprintln(l.output, i...)
132
132
}
133
133
134
134
func (l * Logger ) Printf (format string , args ... interface {}) {
135
- fmt . Fprintf ( l . output , format , args ... )
135
+ l . log ( 0 , format , args ... )
136
136
}
137
137
138
138
func (l * Logger ) Printj (j JSON ) {
139
- json . NewEncoder ( l . output ). Encode ( j )
139
+ l . log ( 0 , "json" , j )
140
140
}
141
141
142
142
func (l * Logger ) Debug (i ... interface {}) {
@@ -188,17 +188,33 @@ func (l *Logger) Errorj(j JSON) {
188
188
}
189
189
190
190
func (l * Logger ) Fatal (i ... interface {}) {
191
- l .log ( FATAL , "" , i ... )
191
+ l .Print ( i ... )
192
192
os .Exit (1 )
193
193
}
194
194
195
195
func (l * Logger ) Fatalf (format string , args ... interface {}) {
196
- l .log ( FATAL , format , args ... )
196
+ l .Printf ( format , args ... )
197
197
os .Exit (1 )
198
198
}
199
199
200
200
func (l * Logger ) Fatalj (j JSON ) {
201
- l .log (FATAL , "json" , j )
201
+ l .Printj (j )
202
+ os .Exit (1 )
203
+ }
204
+
205
+ func (l * Logger ) Panic (i ... interface {}) {
206
+ l .Print (i ... )
207
+ panic (fmt .Sprint (i ... ))
208
+ }
209
+
210
+ func (l * Logger ) Panicf (format string , args ... interface {}) {
211
+ l .Printf (format , args ... )
212
+ panic (fmt .Sprintf (format , args ))
213
+ }
214
+
215
+ func (l * Logger ) Panicj (j JSON ) {
216
+ l .Printj (j )
217
+ panic (j )
202
218
}
203
219
204
220
func DisableColor () {
@@ -309,6 +325,18 @@ func Fatalj(j JSON) {
309
325
global .Fatalj (j )
310
326
}
311
327
328
+ func Panic (i ... interface {}) {
329
+ global .Panic (i ... )
330
+ }
331
+
332
+ func Panicf (format string , args ... interface {}) {
333
+ global .Panicf (format , args ... )
334
+ }
335
+
336
+ func Panicj (j JSON ) {
337
+ global .Panicj (j )
338
+ }
339
+
312
340
func (l * Logger ) log (v Lvl , format string , args ... interface {}) {
313
341
l .mutex .Lock ()
314
342
defer l .mutex .Unlock ()
@@ -317,7 +345,7 @@ func (l *Logger) log(v Lvl, format string, args ...interface{}) {
317
345
defer l .bufferPool .Put (buf )
318
346
_ , file , line , _ := runtime .Caller (3 )
319
347
320
- if v >= l .level {
348
+ if v >= l .level || v == 0 {
321
349
message := ""
322
350
if format == "" {
323
351
message = fmt .Sprint (args ... )
0 commit comments