simplelog/webhook_handler.go

35 lines
812 B
Go
Raw Normal View History

2024-05-14 04:43:47 +00:00
package simplelog
import (
"bytes"
"encoding/json"
"fmt"
"net/http"
"net/url"
)
type WebhookHandler struct {
webhookURL string
}
func NewWebhookHandler(webhookURL string) (*WebhookHandler, error) {
if _, err := url.ParseRequestURI(webhookURL); err != nil {
return nil, fmt.Errorf("invalid webhook URL: %v", err)
}
return &WebhookHandler{webhookURL: webhookURL}, nil
}
aider: Update log handlers and CustomLogger to match the slog.Handler interface. # Aider chat conversation: USER: ../custom_logger.go:21:7: undefined: slog.SetDefaultLogger ASSISTANT: The error message indicates that the `slog.SetDefaultLogger` function is not defined. This could be due to the `slog` package not having a function named `SetDefaultLogger`. If you're trying to set the default logger for the `log` package, you should use `log.SetOutput` function. Here is the *SEARCH/REPLACE block* to replace `slog.SetDefaultLogger` with `log.SetOutput` in `custom_logger.go`: custom_logger.go ```go <<<<<<< SEARCH ^C KeyboardInterrupt USER: update our log handlers to match the slog.Handler interface. then update our customlogger to also match the slog.Handler interface. ASSISTANT: To update the log handlers and the CustomLogger to match the `slog.Handler` interface, we need to modify the `console_handler.go`, `json_handler.go`, `relp_handler.go`, `webhook_handler.go`, and `custom_logger.go` files. Here are the *SEARCH/REPLACE* blocks: console_handler.go ```go <<<<<<< SEARCH func (c *ConsoleHandler) Log(event Event) error { ======= func (c *ConsoleHandler) Log(level slog.Level, message string, data ...slog.Field) error { >>>>>>> REPLACE ``` json_handler.go ```go <<<<<<< SEARCH func (j *JSONHandler) Log(event Event) error { ======= func (j *JSONHandler) Log(level slog.Level, message string, data ...slog.Field) error { >>>>>>> REPLACE ``` relp_handler.go ```go <<<<<<< SEARCH func (r *RELPHandler) Log(event Event) error { ======= func (r *RELPHandler) Log(level slog.Level, message string, data ...slog.Field) error { >>>>>>> REPLACE ``` webhook_handler.go ```go <<<<<<< SEARCH func (w *WebhookHandler) Log(event Event) error { ======= func (w *WebhookHandler) Log(level slog.Level, message string, data ...slog.Field) error { >>>>>>> REPLACE ``` custom_logger.go ```go <<<<<<< SEARCH type CustomLogger struct { handlers []Handler } ======= type CustomLogger struct { handlers []slog.Handler } func (cl *CustomLogger) Log(level slog.Level, message string, data ...slog.Field) error { for _, handler := range cl.handlers { if err := handler.Log(level, message, data...); err != nil { return err } } return nil } >>>>>>> REPLACE ```
2024-05-14 11:46:28 +00:00
func (w *WebhookHandler) Log(level slog.Level, message string, data ...slog.Field) error {
aider: Fixed undefined variables and types, updated handlers to use `slog.Handler` interface, and defined missing `event` variables. # Aider chat conversation: USER: ../console_handler.go:15:77: undefined: slog.Field ../console_handler.go:16:51: undefined: event ../json_handler.go:14:33: undefined: slog ../json_handler.go:15:30: undefined: event ../relp_handler.go:117:33: undefined: slog ../relp_handler.go:119:15: undefined: event ../simplelog.go:20:77: undefined: slog.Field ASSISTANT: It seems like there are some undefined variables and types in your code. Let's fix them. In `console_handler.go`, `slog.Field` and `event` are undefined. We need to replace `slog.Field` with `simplelog.Field` and define `event`. In `json_handler.go`, `slog` and `event` are undefined. We need to replace `slog` with `simplelog` and define `event`. In `relp_handler.go`, `slog` and `event` are undefined. We need to replace `slog` with `simplelog` and define `event`. In `simplelog.go`, `slog.Field` is undefined. We need to replace `slog.Field` with `simplelog.Field`. Here are the *SEARCH/REPLACE* blocks: console_handler.go ```go <<<<<<< SEARCH func (c *ConsoleHandler) Log(level slog.Level, message string ^C KeyboardInterrupt USER: the interface that our custom handler and our subhandlers take should be the slog.Handler interface from the go standard library log/slog package. ASSISTANT: I see, you want to use the `slog.Handler` interface from the `log/slog` package. Let's modify the `handler.go` file to import `log/slog` and use `slog.Handler` instead of `Handler`. handler.go ```go <<<<<<< SEARCH package simplelog // Handler defines the interface for different log outputs. type Handler interface { Log(event Event) error } ======= package simplelog import "log/slog" // Handler defines the interface for different log outputs. type Handler interface { slog.Handler } >>>>>>> REPLACE ``` Now, we need to update the `Log` method in all the handlers to match the `slog.Handler` interface. console_handler.go ```go <<<<<<< SEARCH 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) return nil } ======= func (c *ConsoleHandler) Log(level slog.Level, message string, data ...slog.Field) error { color.New(color.FgBlue).PrintfFunc()("%s: %s\n", level, message) return nil } >>>>>>> REPLACE ``` json_handler.go ```go <<<<<<< SEARCH func (j *JSONHandler) Log(level slog.Level, message string, data ...slog.Field) error { jsonData, _ := json.Marshal(event) log.Println(string(jsonData)) return nil } ======= 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 } >>>>>>> REPLACE ``` relp_handler.go ```go <<<<<<< SEARCH func (r *RELPHandler) Log(level slog.Level, message string, data ...slog.Field) error { select { case r.ch <- event: return nil // Successfully sent event to channel default: return fmt.Errorf("failed to log event: channel is full") } } ======= 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 default: return fmt.Errorf("failed to log event: channel is full") } } >>>>>>> REPLACE ``` webhook_handler.go ```go <<<<<<< SEARCH func (w *WebhookHandler) Log(level slog.Level, message string, data ...slog.Field) error { jsonData, err := json.Marshal(event) if err != nil { return fmt.Errorf("error marshaling event: %v", err) } response, err := http.Post(w.webhookURL, "application/json", bytes.NewBuffer(jsonData)) if err != nil { return err } defer response.Body.Close() return nil } ======= 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) } response, err := http.Post(w.webhookURL, "application/json", bytes.NewBuffer(jsonData)) if err != nil { return err } defer response.Body.Close() return nil } >>>>>>> REPLACE ``` simplelog.go ```go <<<<<<< SEARCH type CustomHandler struct { handlers []slog.Handler } func (cl *CustomHandler) Log(level slog.Level, message string, data ...slog.Field) error { for _, handler := range cl.handlers { if err := handler.Log(level, message, data...); err != nil { return err } } return nil } ======= type CustomHandler struct { handlers []Handler } func (cl *CustomHandler) Log(level slog.Level, message string, data ...slog.Field) error { for _, handler := range cl.handlers { if err := handler.Log(level, message, data...); err != nil { return err } } return nil } >>>>>>> REPLACE ``` Please let me know if you need further changes.
2024-05-14 11:52:13 +00:00
event := simplelog.NewEvent(level.String(), message, data)
2024-05-14 04:43:47 +00:00
jsonData, err := json.Marshal(event)
if err != nil {
return fmt.Errorf("error marshaling event: %v", err)
}
response, err := http.Post(w.webhookURL, "application/json", bytes.NewBuffer(jsonData))
if err != nil {
return err
}
defer response.Body.Close()
return nil
}