This repository has been archived by the owner on Feb 7, 2023. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 3
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #2 from kitabisa/feat/add-curl-log
feat: added curl request and log improvement by using zerolog
- Loading branch information
Showing
4 changed files
with
241 additions
and
37 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,187 @@ | ||
| package dana | ||
|
|
||
| import ( | ||
| "context" | ||
| "fmt" | ||
| "os" | ||
| "runtime" | ||
| "strings" | ||
| "time" | ||
|
|
||
| "github.com/rs/zerolog" | ||
| ) | ||
|
|
||
| const ( | ||
| APPLICATION_NAME = "sangu-dana" | ||
| LOG_KEY_REQ_ID = "req_id" | ||
| LOG_KEY_METHOD = "method" | ||
| LOG_KEY_CALLER = "caller" | ||
| LOG_LEVEL_TRACE = "trace" | ||
| LOG_LEVEL_DEBUG = "debug" | ||
| LOG_LEVEL_INFO = "info" | ||
| LOG_LEVEL_WARN = "warn" | ||
| LOG_LEVEL_ERROR = "error" | ||
| ) | ||
|
|
||
| type LogOption struct { | ||
| Format string | ||
| Level string | ||
| TimestampFormat string | ||
| CallerToggle bool | ||
| Pretty bool | ||
| } | ||
|
|
||
| type Logger struct { | ||
| logger *zerolog.Logger | ||
| event *zerolog.Event | ||
| useCaller bool | ||
| ctx context.Context | ||
| method string | ||
| } | ||
|
|
||
| func NewLogger(option LogOption) *Logger { | ||
| setLogLevel(option.Level) | ||
| setTimeFormat(option.TimestampFormat) | ||
|
|
||
| var logger zerolog.Logger | ||
|
|
||
| if option.Pretty { | ||
| logger = logger.Output(zerolog.ConsoleWriter{Out: os.Stderr, FormatTimestamp: func(i interface{}) string { return time.Now().Format(option.TimestampFormat) }}) | ||
| } else { | ||
| logger = zerolog.New(os.Stderr).With().Timestamp().Logger() | ||
| } | ||
|
|
||
| return &Logger{ | ||
| logger: &logger, | ||
| useCaller: option.CallerToggle, | ||
| } | ||
| } | ||
|
|
||
| func (l *Logger) Ctx(ctx context.Context) *Logger { | ||
| l.ctx = ctx | ||
| return l | ||
| } | ||
|
|
||
| func (l *Logger) Method(name string) *Logger { | ||
| l.method = name | ||
| return l | ||
| } | ||
|
|
||
| func (l *Logger) Str(key string, val string) *Logger { | ||
| l.event = l.event.Str(key, val) | ||
| return l | ||
| } | ||
|
|
||
| func (l *Logger) Trace(format string, v ...interface{}) { | ||
| l.logEvent(LOG_LEVEL_TRACE).withCtx().withCaller().withMethod().msgf(format, v...) | ||
| } | ||
|
|
||
| func (l *Logger) Debug(format string, v ...interface{}) { | ||
| l.logEvent(LOG_LEVEL_DEBUG).withCtx().withCaller().withMethod().msgf(format, v...) | ||
| } | ||
|
|
||
| func (l *Logger) Info(format string, v ...interface{}) { | ||
| l.logEvent(LOG_LEVEL_INFO).withCtx().withMethod().msgf(format, v...) | ||
| } | ||
|
|
||
| func (l *Logger) Warn(format string, v ...interface{}) { | ||
| l.logEvent(LOG_LEVEL_WARN).withCtx().withCaller().withMethod().msgf(format, v...) | ||
| } | ||
|
|
||
| func (l *Logger) Error(format string, v ...interface{}) { | ||
| l.logEvent(LOG_LEVEL_ERROR).withCtx().withCaller().withMethod().msgf(format, v...) | ||
| } | ||
|
|
||
| func (l *Logger) msgf(format string, v ...interface{}) { | ||
| l.event.Msgf(format, v...) | ||
| } | ||
|
|
||
| func (l *Logger) withCtx() *Logger { | ||
| if l.ctx == nil { | ||
| return l | ||
| } | ||
|
|
||
| reqID, ok := l.ctx.Value(LOG_KEY_REQ_ID).(string) | ||
| if !ok { | ||
| return l | ||
| } | ||
|
|
||
| l.event = l.event.Str(LOG_KEY_REQ_ID, reqID) | ||
| return l | ||
| } | ||
|
|
||
| func (l *Logger) withMethod() *Logger { | ||
| if l.method == "" { | ||
| return l | ||
| } | ||
|
|
||
| l.event = l.event.Str(LOG_KEY_METHOD, l.method) | ||
| return l | ||
| } | ||
|
|
||
| func (l *Logger) withCaller() *Logger { | ||
| if !l.useCaller { | ||
| return l | ||
| } | ||
|
|
||
| skip := 2 // go back up to 2 stack before printing log to know the true caller | ||
| _, file, line, ok := runtime.Caller(skip) | ||
| if !ok { | ||
| return l | ||
| } | ||
|
|
||
| fileparts := strings.Split(file, APPLICATION_NAME) | ||
| shortname := fmt.Sprintf("%s%s", APPLICATION_NAME, fileparts[len(fileparts)-1]) | ||
|
|
||
| l.event = l.event.Str(LOG_KEY_CALLER, fmt.Sprintf("%s:%d", shortname, line)) | ||
| return l | ||
| } | ||
|
|
||
| func (l *Logger) logEvent(level string) *Logger { | ||
| switch level { | ||
| case LOG_LEVEL_TRACE: | ||
| l.event = l.logger.Trace() | ||
| return l | ||
| case LOG_LEVEL_DEBUG: | ||
| l.event = l.logger.Debug() | ||
| return l | ||
| case LOG_LEVEL_INFO: | ||
| l.event = l.logger.Info() | ||
| return l | ||
| case LOG_LEVEL_WARN: | ||
| l.event = l.logger.Warn() | ||
| return l | ||
| case LOG_LEVEL_ERROR: | ||
| l.event = l.logger.Error() | ||
| return l | ||
| default: | ||
| l.event = l.logger.Trace() | ||
| return l | ||
| } | ||
| } | ||
|
|
||
| func setLogLevel(level string) { | ||
| switch level { | ||
| case LOG_LEVEL_TRACE: | ||
| zerolog.SetGlobalLevel(zerolog.TraceLevel) | ||
| case LOG_LEVEL_DEBUG: | ||
| zerolog.SetGlobalLevel(zerolog.DebugLevel) | ||
| case LOG_LEVEL_INFO: | ||
| zerolog.SetGlobalLevel(zerolog.InfoLevel) | ||
| case LOG_LEVEL_WARN: | ||
| zerolog.SetGlobalLevel(zerolog.WarnLevel) | ||
| case LOG_LEVEL_ERROR: | ||
| zerolog.SetGlobalLevel(zerolog.ErrorLevel) | ||
| default: | ||
| zerolog.SetGlobalLevel(zerolog.WarnLevel) | ||
| } | ||
| } | ||
|
|
||
| func setTimeFormat(format string) { | ||
| if format != "" { | ||
| zerolog.TimeFieldFormat = format | ||
| return | ||
| } | ||
|
|
||
| zerolog.TimeFieldFormat = "2006-01-02T15:04:05-0700" | ||
| } |