Skip to content

Commit 86e4227

Browse files
committed
update go mod
1 parent 89ff8a2 commit 86e4227

File tree

16 files changed

+269
-252
lines changed

16 files changed

+269
-252
lines changed

_example/api.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@ import (
44
"github.com/phachon/go-logger"
55
)
66

7-
func main() {
7+
func main() {
88

99
logger := go_logger.NewLogger()
1010

1111
apiConfig := &go_logger.ApiConfig{
12-
Url: "http://127.0.0.1:8081/index.php",
13-
Method: "GET",
14-
Headers: map[string]string{},
15-
IsVerify: false,
12+
Url: "http://127.0.0.1:8081/index.php",
13+
Method: "GET",
14+
Headers: map[string]string{},
15+
IsVerify: false,
1616
VerifyCode: 0,
1717
}
1818
logger.Attach("api", go_logger.LOGGER_LEVEL_DEBUG, apiConfig)
@@ -22,4 +22,4 @@ func main() {
2222
logger.Alert("this is a alert log!")
2323

2424
logger.Flush()
25-
}
25+
}

_example/console.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,16 @@ import (
44
"github.com/phachon/go-logger"
55
)
66

7-
func main() {
7+
func main() {
88

99
logger := go_logger.NewLogger()
1010
//default attach console, detach console
1111
logger.Detach("console")
1212

1313
consoleConfig := &go_logger.ConsoleConfig{
14-
Color: true,
14+
Color: true,
1515
JsonFormat: false,
16-
Format: "%millisecond_format% [%level_string%] [%file%:%line%] %body%",
16+
Format: "%millisecond_format% [%level_string%] [%file%:%line%] %body%",
1717
}
1818

1919
logger.Attach("console", go_logger.LOGGER_LEVEL_DEBUG, consoleConfig)
@@ -44,4 +44,4 @@ func main() {
4444
logger.Debugf("this is a debug %s log!", "format")
4545

4646
logger.Flush()
47-
}
47+
}

_example/file.go

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,28 +4,28 @@ import (
44
"github.com/phachon/go-logger"
55
)
66

7-
func main() {
7+
func main() {
88

99
logger := go_logger.NewLogger()
1010

1111
fileConfig := &go_logger.FileConfig{
12-
Filename : "./test.log",
13-
LevelFileName : map[int]string{
12+
Filename: "./test.log",
13+
LevelFileName: map[int]string{
1414
logger.LoggerLevel("error"): "./error.log",
15-
logger.LoggerLevel("info"): "./info.log",
15+
logger.LoggerLevel("info"): "./info.log",
1616
logger.LoggerLevel("debug"): "./debug.log",
1717
},
18-
MaxSize : 1024 * 1024,
19-
MaxLine : 10000,
20-
DateSlice : "d",
18+
MaxSize: 1024 * 1024,
19+
MaxLine: 10000,
20+
DateSlice: "d",
2121
JsonFormat: false,
22-
Format: "%millisecond_format% [%level_string%] [%file%:%line%] %body%",
22+
Format: "%millisecond_format% [%level_string%] [%file%:%line%] %body%",
2323
}
2424
logger.Attach("file", go_logger.LOGGER_LEVEL_DEBUG, fileConfig)
2525
logger.SetAsync()
2626

2727
i := 0
28-
for {
28+
for {
2929
logger.Emergency("this is a emergency log!")
3030
logger.Alert("this is a alert log!")
3131
logger.Critical("this is a critical log!")
@@ -51,4 +51,4 @@ func main() {
5151
}
5252

5353
logger.Flush()
54-
}
54+
}

api.go

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
package go_logger
22

33
import (
4+
"errors"
45
"fmt"
5-
"strconv"
66
"github.com/phachon/go-logger/utils"
7-
"errors"
87
"reflect"
8+
"strconv"
99
)
1010

1111
const API_ADAPTER_NAME = "api"
@@ -67,37 +67,37 @@ func (adapterApi *AdapterApi) Init(apiConfig Config) error {
6767

6868
func (adapterApi *AdapterApi) Write(loggerMsg *loggerMessage) error {
6969

70-
url := adapterApi.config.Url
71-
method := adapterApi.config.Method
72-
isVerify := adapterApi.config.IsVerify
73-
verifyCode := adapterApi.config.VerifyCode
74-
headers := adapterApi.config.Headers
70+
url := adapterApi.config.Url
71+
method := adapterApi.config.Method
72+
isVerify := adapterApi.config.IsVerify
73+
verifyCode := adapterApi.config.VerifyCode
74+
headers := adapterApi.config.Headers
7575

76-
loggerMap := map[string]string {
77-
"timestamp": strconv.FormatInt(loggerMsg.Timestamp, 10),
78-
"timestamp_format": loggerMsg.TimestampFormat,
79-
"millisecond": strconv.FormatInt(loggerMsg.Millisecond, 10),
76+
loggerMap := map[string]string{
77+
"timestamp": strconv.FormatInt(loggerMsg.Timestamp, 10),
78+
"timestamp_format": loggerMsg.TimestampFormat,
79+
"millisecond": strconv.FormatInt(loggerMsg.Millisecond, 10),
8080
"millisecond_format": loggerMsg.MillisecondFormat,
81-
"level": strconv.Itoa(loggerMsg.Level),
82-
"level_string": loggerMsg.LevelString,
83-
"body": loggerMsg.Body,
84-
"file": loggerMsg.File,
85-
"line": strconv.Itoa(loggerMsg.Line),
86-
"function": loggerMsg.Function,
81+
"level": strconv.Itoa(loggerMsg.Level),
82+
"level_string": loggerMsg.LevelString,
83+
"body": loggerMsg.Body,
84+
"file": loggerMsg.File,
85+
"line": strconv.Itoa(loggerMsg.Line),
86+
"function": loggerMsg.Function,
8787
}
8888

8989
var err error
9090
var code int
9191
if method == "GET" {
9292
_, code, err = utils.NewMisc().HttpGet(url, loggerMap, headers, 0)
93-
}else {
93+
} else {
9494
_, code, err = utils.NewMisc().HttpPost(url, loggerMap, headers, 0)
9595
}
9696
if err != nil {
9797
return err
9898
}
99-
if(isVerify && (code != verifyCode)) {
100-
return fmt.Errorf("%s", "request "+ url +" faild, code=" + strconv.Itoa(code))
99+
if isVerify && (code != verifyCode) {
100+
return fmt.Errorf("%s", "request "+url+" faild, code="+strconv.Itoa(code))
101101
}
102102

103103
return nil
@@ -107,10 +107,10 @@ func (adapterApi *AdapterApi) Flush() {
107107

108108
}
109109

110-
func (adapterApi *AdapterApi)Name() string {
110+
func (adapterApi *AdapterApi) Name() string {
111111
return API_ADAPTER_NAME
112112
}
113113

114-
func init() {
114+
func init() {
115115
Register(API_ADAPTER_NAME, NewAdapterApi)
116-
}
116+
}

benchmark_test.go

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -45,11 +45,11 @@ func BenchmarkLoggerConsoleJson(b *testing.B) {
4545
}
4646

4747
// go test -run=benchmark -cpu=1,2,4 -benchmem -benchtime=3s -bench="FileText"
48-
func BenchmarkLoggerFileText(b *testing.B) {
48+
func BenchmarkLoggerFileText(b *testing.B) {
4949
logger := NewLogger()
5050
logger.Detach("console")
5151
logger.Attach("file", LOGGER_LEVEL_DEBUG, &FileConfig{
52-
Filename:"./test.log",
52+
Filename: "./test.log",
5353
DateSlice: "d",
5454
})
5555
b.ResetTimer()
@@ -61,11 +61,11 @@ func BenchmarkLoggerFileText(b *testing.B) {
6161
}
6262

6363
// go test -run=benchmark -cpu=1,2,4 -benchmem -benchtime=3s -bench="AsyncText"
64-
func BenchmarkLoggerFileAsyncText(b *testing.B) {
64+
func BenchmarkLoggerFileAsyncText(b *testing.B) {
6565
logger := NewLogger()
6666
logger.Detach("console")
6767
logger.Attach("file", LOGGER_LEVEL_DEBUG, &FileConfig{
68-
Filename:"./test.log",
68+
Filename: "./test.log",
6969
DateSlice: "d",
7070
})
7171
logger.SetAsync()
@@ -80,12 +80,12 @@ func BenchmarkLoggerFileAsyncText(b *testing.B) {
8080
}
8181

8282
// go test -run=benchmark -cpu=1,2,4 -benchmem -benchtime=3s -bench="FileJson"
83-
func BenchmarkLoggerFileJson(b *testing.B) {
83+
func BenchmarkLoggerFileJson(b *testing.B) {
8484
logger := NewLogger()
8585
logger.Detach("console")
8686
logger.Attach("file", LOGGER_LEVEL_DEBUG, &FileConfig{
87-
Filename:"./test.log",
88-
DateSlice: "d",
87+
Filename: "./test.log",
88+
DateSlice: "d",
8989
JsonFormat: true,
9090
})
9191
b.ResetTimer()
@@ -94,4 +94,4 @@ func BenchmarkLoggerFileJson(b *testing.B) {
9494
logger.Info("benchmark logger message")
9595
}
9696
})
97-
}
97+
}

config.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ package go_logger
33
// logger config interface
44
type Config interface {
55
Name() string
6-
}
6+
}

console.go

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,36 @@
11
package go_logger
22

33
import (
4-
"sync"
5-
"io"
4+
"errors"
65
"github.com/fatih/color"
6+
"io"
77
"os"
88
"reflect"
9-
"errors"
9+
"sync"
1010
)
1111

12-
const CONSOLE_ADAPTER_NAME = "console"
13-
14-
var levelColors = map[int] color.Attribute {
15-
LOGGER_LEVEL_EMERGENCY: color.FgWhite, //white
16-
LOGGER_LEVEL_ALERT: color.FgCyan, //cyan
17-
LOGGER_LEVEL_CRITICAL: color.FgMagenta,//magenta
18-
LOGGER_LEVEL_ERROR: color.FgRed, //red
19-
LOGGER_LEVEL_WARNING: color.FgYellow, //yellow
20-
LOGGER_LEVEL_NOTICE: color.FgGreen, //green
21-
LOGGER_LEVEL_INFO: color.FgBlue, //blue
22-
LOGGER_LEVEL_DEBUG: color.BgBlue, //background blue
12+
const CONSOLE_ADAPTER_NAME = "console"
13+
14+
var levelColors = map[int]color.Attribute{
15+
LOGGER_LEVEL_EMERGENCY: color.FgWhite, //white
16+
LOGGER_LEVEL_ALERT: color.FgCyan, //cyan
17+
LOGGER_LEVEL_CRITICAL: color.FgMagenta, //magenta
18+
LOGGER_LEVEL_ERROR: color.FgRed, //red
19+
LOGGER_LEVEL_WARNING: color.FgYellow, //yellow
20+
LOGGER_LEVEL_NOTICE: color.FgGreen, //green
21+
LOGGER_LEVEL_INFO: color.FgBlue, //blue
22+
LOGGER_LEVEL_DEBUG: color.BgBlue, //background blue
2323
}
2424

2525
// adapter console
2626
type AdapterConsole struct {
27-
write *ConsoleWriter
27+
write *ConsoleWriter
2828
config *ConsoleConfig
2929
}
3030

3131
// console writer
3232
type ConsoleWriter struct {
33-
lock sync.Mutex
33+
lock sync.Mutex
3434
writer io.Writer
3535
}
3636

@@ -70,8 +70,8 @@ func NewAdapterConsole() LoggerAbstract {
7070
}
7171
config := &ConsoleConfig{}
7272
return &AdapterConsole{
73-
write: consoleWrite,
74-
config : config,
73+
write: consoleWrite,
74+
config: config,
7575
}
7676
}
7777

@@ -94,11 +94,11 @@ func (adapterConsole *AdapterConsole) Init(consoleConfig Config) error {
9494
func (adapterConsole *AdapterConsole) Write(loggerMsg *loggerMessage) error {
9595

9696
msg := ""
97-
if adapterConsole.config.JsonFormat == true {
97+
if adapterConsole.config.JsonFormat == true {
9898
//jsonByte, _ := json.Marshal(loggerMsg)
9999
jsonByte, _ := loggerMsg.MarshalJSON()
100100
msg = string(jsonByte)
101-
}else {
101+
} else {
102102
msg = loggerMessageFormat(adapterConsole.config.Format, loggerMsg)
103103
}
104104
consoleWriter := adapterConsole.write
@@ -134,6 +134,6 @@ func (adapterConsole *AdapterConsole) getColorByLevel(level int, content string)
134134
return lc
135135
}
136136

137-
func init() {
137+
func init() {
138138
Register(CONSOLE_ADAPTER_NAME, NewAdapterConsole)
139-
}
139+
}

0 commit comments

Comments
 (0)