chrissewell/hetty
1
0
Fork 0
mirror of https://github.com/dstotijn/hetty.git synced 2025-07-01 18:47:29 -04:00
Code Issues Packages Projects Releases Wiki Activity

Use ffcli, tidy up usage message

Browse Source
This commit is contained in:
David Stotijn
2022-02-28 12:50:09 +01:00
parent d438f93ee0
commit ca0c085021
6 changed files with 328 additions and 215 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
pkg/log/log.go
View File

@ -14,13 +14,13 @@ type Logger interface {
Errorw(msg string, v ...interface{})
}
func NewZapLogger(debug, pretty bool) (*zap.Logger, error) {
func NewZapLogger(verbose, jsonLogs bool) (*zap.Logger, error) {
var config zap.Config
if debug {
if verbose {
config = zap.Config{
Level: zap.NewAtomicLevelAt(zap.DebugLevel),
Development: debug,
Development: true,
Encoding: "json",
EncoderConfig: zapcore.EncoderConfig{
TimeKey: "ts",
@ -43,7 +43,7 @@ func NewZapLogger(debug, pretty bool) (*zap.Logger, error) {
config = zap.NewProductionConfig()
}
if pretty {
if !jsonLogs {
config.Encoding = "console"
config.EncoderConfig = zapcore.EncoderConfig{
TimeKey: "T",
@ -67,7 +67,7 @@ func NewZapLogger(debug, pretty bool) (*zap.Logger, error) {
EncodeCaller: zapcore.ShortCallerEncoder,
}
if debug {
if verbose {
config.EncoderConfig.CallerKey = "C"
config.EncoderConfig.StacktraceKey = "S"
}