Skip to content

Commit bcc3e1c

Browse files
committed
log
1 parent e101db8 commit bcc3e1c

File tree

4 files changed

+6
-21
lines changed

4 files changed

+6
-21
lines changed

client.go

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,8 @@ type Client struct {
3232

3333
environment state
3434

35-
log *slog.Logger
36-
logHandlerOptions *slog.HandlerOptions
37-
client *resty.Client
35+
log *slog.Logger
36+
client *resty.Client
3837
}
3938

4039
// NewClient creates a Flagsmith [Client] using the environment determined by apiKey.

logger.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import (
44
"context"
55
"fmt"
66
"log/slog"
7-
"os"
87
"time"
98

109
"github.com/go-resty/resty/v2"
@@ -31,7 +30,7 @@ func (s restySlogLogger) Debugf(format string, v ...interface{}) {
3130
}
3231

3332
func defaultLogger() *slog.Logger {
34-
return slog.New(slog.NewJSONHandler(os.Stderr, nil)).WithGroup("flagsmith")
33+
return slog.Default().WithGroup("flagsmith")
3534
}
3635

3736
func newRestyLogRequestMiddleware(logger *slog.Logger) resty.RequestMiddleware {

options.go

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -158,16 +158,3 @@ func WithRealtimeBaseURL(url string) Option {
158158
c.config.realtimeBaseUrl = url
159159
}
160160
}
161-
162-
// WithLogLevel sets the log level to a [slog.Level] value.
163-
func WithLogLevel(level slog.Leveler) Option {
164-
return withLogHandlerOptions(&slog.HandlerOptions{
165-
Level: level,
166-
})
167-
}
168-
169-
func withLogHandlerOptions(opts *slog.HandlerOptions) Option {
170-
return func(c *Client) {
171-
c.logHandlerOptions = opts
172-
}
173-
}

realtime.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ func (c *Client) startRealtimeUpdates(ctx context.Context) {
2626
default:
2727
resp, err := http.Get(stream_url)
2828
if err != nil {
29-
c.log.Error("failed to connect to SSE service", "error", err)
29+
c.log.Error("failed to connect to realtime service", "error", err)
3030
continue
3131
}
3232
defer resp.Body.Close()
@@ -37,7 +37,7 @@ func (c *Client) startRealtimeUpdates(ctx context.Context) {
3737
if strings.HasPrefix(line, "data: ") {
3838
parsedTime, err := parseUpdatedAtFromSSE(line)
3939
if err != nil {
40-
c.log.Error("failed to parse real-time update event", "error", err, "raw_event", line)
40+
c.log.Error("failed to parse realtime update event", "error", err, "raw_event", line)
4141
continue
4242
}
4343
if parsedTime.After(envUpdatedAt) {
@@ -54,7 +54,7 @@ func (c *Client) startRealtimeUpdates(ctx context.Context) {
5454
}
5555
}
5656
if err := scanner.Err(); err != nil {
57-
c.log.Error("failed to read from real-time stream", "error", err)
57+
c.log.Error("failed to read from realtime stream", "error", err, "stream_url", &resp.Request.URL)
5858
}
5959
}
6060
}

0 commit comments

Comments
 (0)