Skip to content

Commit b3a1d96

Browse files
committed
using latest zerologger, console color can be disabled in config
1 parent 96fa924 commit b3a1d96

File tree

4 files changed

+26
-10
lines changed

4 files changed

+26
-10
lines changed

go.mod

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
11
module github.com/haxii/log
22

3-
require github.com/rs/zerolog v1.11.0
3+
require github.com/rs/zerolog v1.15.0
4+
5+
go 1.13

go.sum

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,13 @@
1+
github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
2+
github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
3+
github.com/rs/xid v1.2.1/go.mod h1:+uKXf+4Djp6Md1KODXJxgGQPKngRmWyn10oCKFzNHOQ=
14
github.com/rs/zerolog v1.11.0/go.mod h1:YbFCdg8HfsridGWAh22vktObvhZbQsZXe4/zB0OKkWU=
5+
github.com/rs/zerolog v1.15.0 h1:uPRuwkWF4J6fGsJ2R0Gn2jB1EQiav9k3S6CSdygQJXY=
6+
github.com/rs/zerolog v1.15.0/go.mod h1:xYTKnLHcpfU2225ny5qZjxnj9NvkumZYjJHlAThCjNc=
7+
github.com/zenazn/goji v0.9.0/go.mod h1:7S9M489iMyHBNxwZnk9/EHS098H4/F6TATF2mIxtB1Q=
8+
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
9+
golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
10+
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
11+
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
12+
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
13+
golang.org/x/tools v0.0.0-20190425163242-31fd60d6bfdc/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=

logstash.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ const (
4040
LogstashInputTypeUDP
4141
)
4242

43-
// LogstashConfig config for logstash
43+
// LogstashConfig config for logStash
4444
type LogstashConfig struct {
4545
Type LogstashInputType
4646
Addr string
@@ -50,7 +50,7 @@ type LogstashConfig struct {
5050

5151
var minKeepAliveCheckInterval = 1 * time.Second
5252

53-
var errUnknownInputType = errors.New("unsupported logstash input type")
53+
var errUnknownInputType = errors.New("unsupported logStash input type")
5454

5555
func makeLogstashWriter(c LogstashConfig) (*logstashWriter, error) {
5656
var conn net.Conn
@@ -172,7 +172,7 @@ func (l *logstashWriter) reconnect() error {
172172

173173
var udpSrcAddr = &net.UDPAddr{IP: net.IPv4zero, Port: 0}
174174

175-
// Write implements io.Write interface using logstash TCP & UDP input
175+
// Write implements io.Write interface using logStash TCP & UDP input
176176
func (l *logstashWriter) Write(p []byte) (n int, err error) {
177177
if l.inputType == LogstashInputTypeUDP {
178178
return l.conn.Write(p)

zerologger.go

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ type ZeroLogger struct {
1818
isProduction bool
1919
logger zerolog.Logger
2020
logFile *os.File
21-
logstash *logstashWriter
21+
logStash *logstashWriter
2222
}
2323

2424
// GetZeroLogger returns the zero logger instance for advanced usage
@@ -72,6 +72,8 @@ type LazyLogging struct {
7272

7373
// LoggingConfig helper for a logging destination
7474
type LoggingConfig struct {
75+
// Disable console color
76+
DisableConsoleColor bool
7577
// FileDir write log to dir
7678
FileDir string
7779
// Logstash config
@@ -112,28 +114,28 @@ func MakeZeroLogger(debug bool, c LoggingConfig, service string) (*ZeroLogger, e
112114
}
113115

114116
if c.Logstash != nil {
115-
l.logstash, err = makeLogstashWriter(*c.Logstash)
117+
l.logStash, err = makeLogstashWriter(*c.Logstash)
116118
if err != nil {
117119
return nil, err
118120
}
119121
if c.LazyLogging != nil {
120-
diodeLogstash := diode.NewWriter(l.logstash,
122+
diodeLogstash := diode.NewWriter(l.logStash,
121123
c.LazyLogging.DiodeSize, c.LazyLogging.PoolInterval, nil)
122124
logWriters = append(logWriters, diodeLogstash)
123125
} else {
124-
logWriters = append(logWriters, l.logstash)
126+
logWriters = append(logWriters, l.logStash)
125127
}
126128
}
127129

128130
if debug {
129-
logWriters = append(logWriters, zerolog.ConsoleWriter{Out: os.Stderr})
131+
logWriters = append(logWriters, zerolog.ConsoleWriter{Out: os.Stderr, NoColor: c.DisableConsoleColor})
130132
zerolog.SetGlobalLevel(zerolog.DebugLevel)
131133
} else {
132134
zerolog.SetGlobalLevel(zerolog.WarnLevel)
133135
}
134136

135137
if len(logWriters) == 0 {
136-
return nil, errors.New("no log writer avaliable")
138+
return nil, errors.New("no log writer available")
137139
}
138140

139141
l.logger = zerolog.

0 commit comments

Comments
 (0)