Mechanical switch from log to slog #2056
Conversation
dhiltgen
force-pushed
the
slog
branch
2 times, most recently
from
3ec7636
to
65517d5
Compare
|
Example output on linux with debug turned on Normal linux without enabling debug: |
| @@ -7,7 +7,7 @@ | |||
| Install required tools: | |||
There was a problem hiding this comment.
The help text just above here is confusing. I'm not quite sure what to do w/
- Install cmake or (optionally, required tools for GPUs)
is the or for the other tools for GPUs, or for go generate/go build?
There was a problem hiding this comment.
I'll tidy this part of the README up.
|
I misremembered how slog works. For dynamic log level checking, it'll need a custom handler. Something like this should work: type slogHandler struct {
h *slog.TextHandler
}
func (h slogHandler) Enabled(ctx context.Context, level Level) bool {
if _, ok := os.Getenv("OLLAMA_DEBUG"); ok {
return level >= slog.LevelDebug
}
return h.Enabled(ctx, level)
} |
| @@ -892,6 +893,13 @@ func (s *Server) GenerateRoutes() http.Handler { | |||
| } | |||
|
|
|||
| func Serve(ln net.Listener) error { | |||
| if debug := os.Getenv("OLLAMA_DEBUG"); debug != "" { | |||
There was a problem hiding this comment.
This should be declared globally in cmd so it configures non-server commands too
There was a problem hiding this comment.
My intent was to only impact the server to narrow the scope.
I think being explicit on level is better and makes it easier for us to start to adjust the levels for messages in follow-up incremental changes. I didn't do an analysis of every log output but just skimmed for obvious warn/err scenarios to adjust those, but I would like to continue refining the levels over time. |
|
There's some |
A few obvious levels were adjusted, but generally everything mapped to "info" level.
A few obvious levels were adjusted, but generally everything mapped to "info" level.