Skip to content

Commit

Permalink
Merge pull request #8 from seipan/feature/log-with-context
Browse files Browse the repository at this point in the history
feat(logger) : Add a method to each log that takes a context as an argument
  • Loading branch information
seipan committed Oct 4, 2023
2 parents 3a29bef + 8ca60c7 commit aeaaf36
Show file tree
Hide file tree
Showing 2 changed files with 48 additions and 17 deletions.
61 changes: 44 additions & 17 deletions logger.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
package loghook

import (
"context"
"fmt"
"os"
"sync"
Expand Down Expand Up @@ -64,7 +65,7 @@ func NewLogger(img string, name string, types string, webhook string) *Logger {
}
}

func (l *Logger) check(level Level) bool {
func (l *Logger) check(ctx context.Context, level Level) bool {
return (l.checkTypes() && l.Level() <= level)
}

Expand Down Expand Up @@ -241,8 +242,8 @@ func (l *Logger) NoSendFatal() {
}
}

func (l *Logger) Log(level Level, args ...interface{}) {
if l.check(level) {
func (l *Logger) Log(ctx context.Context, level Level, args ...interface{}) {
if l.check(ctx, level) {
message := ""
message = fmt.Sprint(args...)

Expand Down Expand Up @@ -278,8 +279,8 @@ func (l *Logger) Log(level Level, args ...interface{}) {
}
}

func (l *Logger) Logf(level Level, format string, args ...interface{}) {
if l.check(level) {
func (l *Logger) Logf(ctx context.Context, level Level, format string, args ...interface{}) {
if l.check(ctx, level) {
message := ""
message = fmt.Sprintf(format, args...)

Expand Down Expand Up @@ -315,54 +316,80 @@ func (l *Logger) Logf(level Level, format string, args ...interface{}) {
}

func (l *Logger) Info(i ...interface{}) {
l.Log(InfoLevel, i...)
l.Log(context.Background(), InfoLevel, i...)

}

func (l *Logger) Infof(format string, i ...interface{}) {
l.Logf(InfoLevel, format, i...)
l.Logf(context.Background(), InfoLevel, format, i...)
}

func (l *Logger) InfoContext(ctx context.Context, format string, i ...interface{}) {
l.Logf(ctx, InfoLevel, format, i...)
}

func (l *Logger) Debug(i ...interface{}) {
l.Log(DebugLevel, i...)
l.Log(context.Background(), DebugLevel, i...)
}

func (l *Logger) Debugf(format string, i ...interface{}) {
l.Logf(DebugLevel, format, i...)
l.Logf(context.Background(), DebugLevel, format, i...)
}

func (l *Logger) DebugContext(ctx context.Context, i ...interface{}) {
l.Log(ctx, DebugLevel, i...)
}

func (l *Logger) Error(i ...interface{}) {
l.Log(ErrorLevel, i...)
l.Log(context.Background(), ErrorLevel, i...)
}

func (l *Logger) Errorf(format string, i ...interface{}) {
l.Logf(ErrorLevel, format, i...)
l.Logf(context.Background(), ErrorLevel, format, i...)
}

func (l *Logger) ErrorContext(ctx context.Context, i ...interface{}) {
l.Log(ctx, ErrorLevel, i...)
}

func (l *Logger) Warn(i ...interface{}) {
l.Log(WarnLevel, i...)
l.Log(context.Background(), WarnLevel, i...)
}

func (l *Logger) Warnf(format string, i ...interface{}) {
l.Logf(WarnLevel, format, i...)
l.Logf(context.Background(), WarnLevel, format, i...)
}

func (l *Logger) WarnContext(ctx context.Context, i ...interface{}) {
l.Log(ctx, WarnLevel, i...)
}

func (l *Logger) Fatal(i ...interface{}) {
l.Log(FatalLevel, i...)
l.Log(context.Background(), FatalLevel, i...)
os.Exit(1)
}

func (l *Logger) Fatalf(format string, i ...interface{}) {
l.Logf(FatalLevel, format, i...)
l.Logf(context.Background(), FatalLevel, format, i...)
os.Exit(1)
}

func (l *Logger) FatalContext(ctx context.Context, i ...interface{}) {
l.Log(ctx, FatalLevel, i...)
os.Exit(1)
}

func (l *Logger) Panic(i ...interface{}) {
l.Log(PanicLevel, i...)
l.Log(context.Background(), PanicLevel, i...)
panic(fmt.Sprint(i...))
}

func (l *Logger) Panicf(format string, i ...interface{}) {
l.Logf(PanicLevel, format, i...)
l.Logf(context.Background(), PanicLevel, format, i...)
panic(fmt.Sprintf(format, i...))
}

func (l *Logger) PanicContext(ctx context.Context, i ...interface{}) {
l.Log(ctx, PanicLevel, i...)
panic(fmt.Sprint(i...))
}
4 changes: 4 additions & 0 deletions logger_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
package loghook

import (
"context"
"testing"
)

Expand All @@ -41,8 +42,10 @@ func TestDiscordExample(t *testing.T) {

logger.NoSendDebug()
logger.Debug("test")
logger.DebugContext(context.Background(), "test")
logger.NoSendInfo()
logger.Infof("test %s", "info")
logger.InfoContext(context.Background(), "test")
}

func TestSlackExample(t *testing.T) {
Expand All @@ -52,4 +55,5 @@ func TestSlackExample(t *testing.T) {

logger.NoSendDebug()
logger.Debugf("test %s", "debug")
logger.DebugContext(context.Background(), "test")
}

0 comments on commit aeaaf36

Please sign in to comment.