Skip to content

Commit 9589249

Browse files
ricardorg79ricardorg79
committed
removing bload
1 parent 2e41c73 commit 9589249

File tree

4 files changed

+31
-144
lines changed

4 files changed

+31
-144
lines changed

‎debug/main.go

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,20 @@
11
package main
22

33
import (
4+
"os"
45
"time"
56

67
"github.com/libgolang/log"
78
)
89

910
func main() {
11+
/*
12+
w := &log.WriterStdout{}
13+
w.SetLevel(log.DEBUG)
14+
log.SetWriters([]log.Writer{w})
15+
*/
16+
os.Setenv("LOG_CONFIG", "./config.properties")
17+
1018
log.Debug("Debug")
1119
log.Info("Info")
1220
log.Warn("Warn")

‎file_writer.go

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -64,23 +64,21 @@ func NewFileWriter(logDir, fileName string, maxSize FileSize, maxNumFiles int, l
6464
}
6565

6666
type writeLogMsg struct {
67-
name string
6867
mLevel Level
6968
format string
7069
args []interface{}
7170
}
7271

7372
// WriteLog implementation of logger.Writer
7473
func (fw *fileWriter) WriteLog(
75-
name string,
7674
mLevel Level,
7775
format string,
7876
args []interface{},
7977
) {
8078
if fw.level < mLevel {
8179
return
8280
}
83-
fw.logQueue <- &writeLogMsg{name, mLevel, format, args}
81+
fw.logQueue <- &writeLogMsg{mLevel, format, args}
8482
}
8583

8684
func (fw *fileWriter) SetLevel(level Level) {
@@ -92,9 +90,9 @@ func (fw *fileWriter) writeLog(m *writeLogMsg) {
9290
var preFormat string
9391
if IsTraceEnabled() {
9492
_, file, line, _ := runtime.Caller(4)
95-
preFormat = fmt.Sprintf("%s %s [%s] %s:%d %s\n", time.Now().Format(time.RFC3339), m.mLevel, m.name, file, line, m.format)
93+
preFormat = fmt.Sprintf("%s %s %s:%d %s\n", time.Now().Format(time.RFC3339), m.mLevel, file, line, m.format)
9694
} else {
97-
preFormat = fmt.Sprintf("%s %s [%s] %s\n", time.Now().Format(time.RFC3339), m.mLevel, m.name, m.format)
95+
preFormat = fmt.Sprintf("%s %s %s\n", time.Now().Format(time.RFC3339), m.mLevel, m.format)
9896
}
9997

10098
str := fmt.Sprintf(preFormat, m.args...)

‎logger.go

Lines changed: 11 additions & 134 deletions
Original file line numberDiff line numberDiff line change
@@ -9,64 +9,16 @@ import (
99
)
1010

1111
var (
12-
globalLoadedConfig = false
13-
globalLevels = make(map[string]Level)
14-
globalLoggers = make(map[string]Logger)
1512
globalWriters = []Writer{getDefaultWriter()}
16-
globalLogger = New("")
1713
globalTraceEnabled = false
1814
)
1915

20-
// Logger interface exposed to users
21-
type Logger interface {
22-
Err(format string, args ...interface{}) error
23-
Error(format string, args ...interface{})
24-
Warn(format string, args ...interface{})
25-
Info(format string, args ...interface{})
26-
Debug(format string, args ...interface{})
27-
Panic(format string, args ...interface{})
28-
SetLevel(Level)
29-
}
30-
3116
// Writer writer interface
3217
type Writer interface {
33-
WriteLog(name string, logLevel Level, format string, args []interface{})
18+
WriteLog(logLevel Level, format string, args []interface{})
3419
SetLevel(level Level)
3520
}
3621

37-
// logger instance
38-
type logger struct {
39-
level Level
40-
name string
41-
}
42-
43-
// New constructor
44-
func New(name string) Logger {
45-
// level
46-
var lvl Level
47-
if l, ok := globalLevels[name]; ok {
48-
lvl = l
49-
} else {
50-
lvl = globalLevels[""]
51-
}
52-
53-
l := &logger{lvl, name}
54-
globalLoggers[name] = l
55-
56-
if !globalLoadedConfig {
57-
LoadLogProperties()
58-
globalLoadedConfig = true
59-
}
60-
61-
return l
62-
}
63-
64-
// SetDefaultLevel sets the default logging level. It defaults to WARN
65-
func SetDefaultLevel(l Level) {
66-
globalLevels[""] = l
67-
globalLogger.SetLevel(l)
68-
}
69-
7022
// SetTrace when set to true, the log will print file names and line numbers
7123
func SetTrace(trace bool) {
7224
globalTraceEnabled = trace
@@ -77,109 +29,53 @@ func IsTraceEnabled() bool {
7729
return globalTraceEnabled
7830
}
7931

80-
// SetLoggerLevels sets the levels for all existing loggers and future loggers
81-
func SetLoggerLevels(levels map[string]Level) {
82-
//
83-
for k, lev := range levels {
84-
if log, ok := globalLoggers[k]; ok {
85-
log.SetLevel(lev)
86-
}
87-
}
88-
89-
// make sure there is always a root logger level
90-
if _, ok := levels[""]; !ok {
91-
levels[""] = WARN
92-
}
93-
94-
//
95-
globalLevels = levels
96-
}
97-
9832
// SetWriters sets the writers for all the loggers
9933
func SetWriters(w []Writer) {
10034
globalWriters = w
10135
}
10236

103-
// Err logs at error level and returns the error
104-
func (l *logger) Err(format string, a ...interface{}) error {
105-
PrintLog(l.name, l.level, ERROR, format, a)
106-
return fmt.Errorf(format, a...)
107-
}
108-
109-
// Error logs at error level
110-
func (l *logger) Error(format string, a ...interface{}) {
111-
PrintLog(l.name, l.level, ERROR, format, a)
112-
}
113-
114-
// Info logs at info level
115-
func (l *logger) Info(format string, a ...interface{}) {
116-
PrintLog(l.name, l.level, INFO, format, a)
117-
}
118-
119-
// Warn logs at wanr level
120-
func (l *logger) Warn(format string, a ...interface{}) {
121-
PrintLog(l.name, l.level, WARN, format, a)
122-
}
123-
124-
// Debug logs at debug level
125-
func (l *logger) Debug(format string, a ...interface{}) {
126-
PrintLog(l.name, l.level, DEBUG, format, a)
127-
}
128-
129-
// Panic error and exit
130-
func (l *logger) Panic(format string, a ...interface{}) {
131-
PrintLog(l.name, l.level, ERROR, format, a)
132-
panic("panic!")
133-
}
134-
135-
// SetLevel set logger level
136-
func (l *logger) SetLevel(level Level) {
137-
l.level = level
138-
}
139-
14037
// PrintLog sends a log message to the writers.
14138
// name: logger name
14239
// loggerLevel: the level of the logger implementation
14340
// logLevel: the level of the message. If the level of the message is greater than loggerLevel the log will bi discarted
14441
// format: log format. See fmt.Printf
14542
// a...: arguments. See fmt.Printf
146-
func PrintLog(name string, loggerLevel, logLevel Level, format string, a []interface{}) {
147-
if loggerLevel < logLevel {
148-
return
149-
}
43+
func PrintLog(logLevel Level, format string, a []interface{}) {
15044
for _, w := range globalWriters {
151-
w.WriteLog(name, logLevel, format, a)
45+
w.WriteLog(logLevel, format, a)
15246
}
15347
}
15448

15549
// Err log to root logger
15650
func Err(format string, a ...interface{}) error {
157-
return globalLogger.Err(format, a...)
51+
PrintLog(ERROR, format, a)
52+
return fmt.Errorf(format, a...)
15853
}
15954

16055
// Error log to root logger
16156
func Error(format string, a ...interface{}) {
162-
globalLogger.Error(format, a...)
57+
PrintLog(ERROR, format, a)
16358
}
16459

16560
// Info log to root logger
16661
func Info(format string, a ...interface{}) {
167-
globalLogger.Info(format, a...)
62+
PrintLog(INFO, format, a)
16863
}
16964

17065
// Warn log to root logger
17166
func Warn(format string, a ...interface{}) {
172-
globalLogger.Warn(format, a...)
67+
PrintLog(WARN, format, a)
17368
}
17469

17570
// Debug log to root logger
17671
func Debug(format string, a ...interface{}) {
177-
globalLogger.Debug(format, a...)
72+
PrintLog(DEBUG, format, a)
17873
}
17974

18075
// Panic log to root logger
18176
func Panic(format string, a ...interface{}) {
182-
globalLogger.Panic(format, a...)
77+
PrintLog(ERROR, format, a)
78+
panic(fmt.Errorf(format, a...))
18379
}
18480

18581
// resolves configuration
@@ -219,24 +115,6 @@ func LoadLogProperties() {
219115
SetTrace(true)
220116
}
221117

222-
//
223-
// Levels
224-
//
225-
logLevels := make(map[string]Level)
226-
logLevels[""] = StrToLevel(props.GetString("log.level", ""))
227-
for k, v := range props.Map() {
228-
if !strings.HasPrefix(k, "log.level.") {
229-
continue
230-
}
231-
232-
parts := strings.Split(k, ".")
233-
if len(parts) != 3 {
234-
continue
235-
}
236-
loggerName := parts[2] //log.level.name1=stdout|file
237-
logLevels[loggerName] = StrToLevel(v)
238-
}
239-
240118
//
241119
// Writers
242120
//
@@ -274,7 +152,6 @@ func LoadLogProperties() {
274152
}
275153
}
276154

277-
SetLoggerLevels(logLevels)
278155
if len(logWriters) > 0 {
279156
SetWriters(logWriters)
280157
}

‎stdout_writer.go

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,13 @@ type WriterStdout struct {
1111
level Level
1212
}
1313

14+
// NewStdoutWriter constructor
15+
func NewStdoutWriter(level Level) Writer {
16+
return &WriterStdout{level}
17+
}
18+
1419
// WriteLog implementation of logger.Writer
1520
func (w *WriterStdout) WriteLog(
16-
name string,
1721
mLevel Level,
1822
format string,
1923
args []interface{},
@@ -26,11 +30,11 @@ func (w *WriterStdout) WriteLog(
2630
var preFormatArgs []interface{}
2731
if IsTraceEnabled() {
2832
_, file, line, _ := runtime.Caller(4)
29-
preFormatStr = "%s %s [%s] %s:%d %s\n"
30-
preFormatArgs = []interface{}{time.Now().Format(time.RFC3339), mLevel.StringColor(), name, file, line, format}
33+
preFormatStr = "%s %s %s:%d %s\n"
34+
preFormatArgs = []interface{}{time.Now().Format(time.RFC3339), mLevel.StringColor(), file, line, format}
3135
} else {
32-
preFormatStr = "%s %s [%s] %s\n"
33-
preFormatArgs = []interface{}{time.Now().Format(time.RFC3339), mLevel.StringColor(), name, format}
36+
preFormatStr = "%s %s %s\n"
37+
preFormatArgs = []interface{}{time.Now().Format(time.RFC3339), mLevel.StringColor(), format}
3438
}
3539

3640
preFormat := fmt.Sprintf(preFormatStr, preFormatArgs...)

0 commit comments

Comments
 (0)