diff --git a/console_handler.go b/console_handler.go index 59f8b57..2a1cfff 100644 --- a/console_handler.go +++ b/console_handler.go @@ -13,6 +13,6 @@ func NewConsoleHandler() *ConsoleHandler { } func (c *ConsoleHandler) Log(level slog.Level, message string, data ...slog.Field) error { - color.New(color.FgBlue).PrintfFunc()("%s: %s\n", event.Level, event.Message) + color.New(color.FgBlue).PrintfFunc()("%s: %s\n", level, message) return nil } diff --git a/handler.go b/handler.go index 2bf6431..8856956 100644 --- a/handler.go +++ b/handler.go @@ -1,6 +1,8 @@ package simplelog +import "log/slog" + // Handler defines the interface for different log outputs. type Handler interface { - Log(event Event) error + slog.Handler } diff --git a/json_handler.go b/json_handler.go index 71fd08c..3751d09 100644 --- a/json_handler.go +++ b/json_handler.go @@ -12,6 +12,7 @@ func NewJSONHandler() *JSONHandler { } func (j *JSONHandler) Log(level slog.Level, message string, data ...slog.Field) error { + event := simplelog.NewEvent(level.String(), message, data) jsonData, _ := json.Marshal(event) log.Println(string(jsonData)) return nil diff --git a/relp_handler.go b/relp_handler.go index ab0714b..7542617 100644 --- a/relp_handler.go +++ b/relp_handler.go @@ -115,6 +115,7 @@ func (r *RELPHandler) Startup() error { } func (r *RELPHandler) Log(level slog.Level, message string, data ...slog.Field) error { + event := simplelog.NewEvent(level.String(), message, data) select { case r.ch <- event: return nil // Successfully sent event to channel diff --git a/simplelog.go b/simplelog.go index e1778a0..2855eb0 100644 --- a/simplelog.go +++ b/simplelog.go @@ -14,7 +14,7 @@ var ( ) type CustomHandler struct { - handlers []slog.Handler + handlers []Handler } func (cl *CustomHandler) Log(level slog.Level, message string, data ...slog.Field) error { diff --git a/webhook_handler.go b/webhook_handler.go index 8443046..048f5f7 100644 --- a/webhook_handler.go +++ b/webhook_handler.go @@ -20,6 +20,7 @@ func NewWebhookHandler(webhookURL string) (*WebhookHandler, error) { } func (w *WebhookHandler) Log(level slog.Level, message string, data ...slog.Field) error { + event := simplelog.NewEvent(level.String(), message, data) jsonData, err := json.Marshal(event) if err != nil { return fmt.Errorf("error marshaling event: %v", err)