Skip to content

Commit 7abcfcc

Browse files
authored
support log separator (#243)
1 parent 9c6d104 commit 7abcfcc

File tree

4 files changed

+21
-10
lines changed

4 files changed

+21
-10
lines changed

go.mod

+1-3
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,7 @@ require (
77
github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect
88
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
99
github.com/xeipuuv/gojsonschema v1.1.0
10-
go.uber.org/atomic v1.5.1 // indirect
11-
go.uber.org/multierr v1.4.0 // indirect
12-
go.uber.org/zap v1.9.1
10+
go.uber.org/zap v1.16.0
1311
)
1412

1513
go 1.12

go.sum

+7-7
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORN
1313
github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
1414
github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
1515
github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
16+
github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
1617
github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
1718
github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
1819
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
@@ -29,15 +30,14 @@ github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 h1:EzJWgHo
2930
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415/go.mod h1:GwrjFmJcFw6At/Gs6z4yjiIwzuJ1/+UwLxMQDVQXShQ=
3031
github.com/xeipuuv/gojsonschema v1.1.0 h1:ngVtJC9TY/lg0AA/1k48FYhBrhRoFlEmWzsehpNAaZg=
3132
github.com/xeipuuv/gojsonschema v1.1.0/go.mod h1:5yf86TLmAcydyeJq5YvxkGPE2fm/u4myDekKRoLuqhs=
32-
go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ=
33-
go.uber.org/atomic v1.5.1 h1:rsqfU5vBkVknbhUGbAUwQKR2H4ItV8tjJ+6kJX4cxHM=
34-
go.uber.org/atomic v1.5.1/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ=
35-
go.uber.org/multierr v1.4.0 h1:f3WCSC2KzAcBXGATIxAB1E2XuCpNU255wNKZ505qi3E=
36-
go.uber.org/multierr v1.4.0/go.mod h1:VgVr7evmIr6uPjLBxg28wmKNXyqE9akIJ5XnfpiKl+4=
33+
go.uber.org/atomic v1.6.0 h1:Ezj3JGmsOnG1MoRWQkPBsKLe9DwWD9QeXzTRzzldNVk=
34+
go.uber.org/atomic v1.6.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ=
35+
go.uber.org/multierr v1.5.0 h1:KCa4XfM8CWFCpxXRGok+Q0SS/0XBhMDbHHGABQLvD2A=
36+
go.uber.org/multierr v1.5.0/go.mod h1:FeouvMocqHpRaaGuG9EjoKcStLC43Zu/fmqdUMPcKYU=
3737
go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee h1:0mgffUl7nfd+FpvXMVz4IDEaUSmT1ysygQC7qYo7sG4=
3838
go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee/go.mod h1:vJERXedbb3MVM5f9Ejo0C68/HhF8uaILCdgjnY+goOA=
39-
go.uber.org/zap v1.9.1 h1:XCJQEf3W6eZaVwhRBof6ImoYGJSITeKWsyeh3HFu/5o=
40-
go.uber.org/zap v1.9.1/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q=
39+
go.uber.org/zap v1.16.0 h1:uFRZXykJGK9lLY4HtgSw44DnIcAM+kRBP7x5m+NpAOM=
40+
go.uber.org/zap v1.16.0/go.mod h1:MA8QOfq0BHJwdXa996Y4dYkAqRKB8/1K1QMMZVaNZjQ=
4141
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
4242
golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
4343
golang.org/x/lint v0.0.0-20190930215403-16217165b5de h1:5hukYrvBGR8/eNkX5mdUezrA6JiaEZDtJb9Ei+1LlBs=

support/log/logger.go

+11
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,9 @@ const (
1818
EnvKeyLogFormat = "FLOGO_LOG_FORMAT"
1919
DefaultLogFormat = FormatConsole
2020

21+
EnvKeyLogSeparator = "FLOGO_LOG_SEPARATOR"
22+
DefaultLogSeparator = "\t"
23+
2124
TraceLevel Level = iota
2225
DebugLevel
2326
InfoLevel
@@ -180,3 +183,11 @@ func ToLogLevel(lvlStr string) Level {
180183

181184
return lvl
182185
}
186+
187+
func getLogSeparator() string {
188+
v, ok := os.LookupEnv(EnvKeyLogSeparator)
189+
if ok && len(v) > 0 {
190+
return v
191+
}
192+
return DefaultLogSeparator
193+
}

support/log/zap.go

+2
Original file line numberDiff line numberDiff line change
@@ -169,6 +169,7 @@ func newZapLogger(logFormat Format) (*zap.Logger, *zap.AtomicLevel, error) {
169169
eCfg.EncodeName = nameEncoder
170170
}
171171

172+
eCfg.ConsoleSeparator = getLogSeparator()
172173
cfg.EncoderConfig = eCfg
173174

174175
lvl := cfg.Level
@@ -190,6 +191,7 @@ func newZapTraceLogger(logFormat Format) (*zap.Logger, *zap.AtomicLevel, error)
190191
eCfg.EncodeLevel = traceLevelEncoder
191192
}
192193

194+
eCfg.ConsoleSeparator = getLogSeparator()
193195
cfg.EncoderConfig = eCfg
194196

195197
lvl := cfg.Level

0 commit comments

Comments
 (0)