Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
OpenDAS
ollama
Commits
583950c8
Unverified
Commit
583950c8
authored
Jan 31, 2024
by
Michael Yang
Committed by
GitHub
Jan 31, 2024
Browse files
Merge pull request #2294 from ollama/mxyng/slog-source
update slog handler options
parents
60f47be6
8ac08a0e
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
18 additions
and
5 deletions
+18
-5
server/routes.go
server/routes.go
+18
-5
No files found.
server/routes.go
View file @
583950c8
...
...
@@ -938,13 +938,26 @@ func (s *Server) GenerateRoutes() http.Handler {
}
func
Serve
(
ln
net
.
Listener
)
error
{
level
:=
slog
.
LevelInfo
if
debug
:=
os
.
Getenv
(
"OLLAMA_DEBUG"
);
debug
!=
""
{
var
programLevel
=
new
(
slog
.
LevelVar
)
h
:=
slog
.
NewTextHandler
(
os
.
Stderr
,
&
slog
.
HandlerOptions
{
Level
:
programLevel
,
AddSource
:
true
})
slog
.
SetDefault
(
slog
.
New
(
h
))
programLevel
.
Set
(
slog
.
LevelDebug
)
slog
.
Debug
(
"Debug logging enabled"
)
level
=
slog
.
LevelDebug
}
handler
:=
slog
.
NewTextHandler
(
os
.
Stderr
,
&
slog
.
HandlerOptions
{
Level
:
level
,
AddSource
:
true
,
ReplaceAttr
:
func
(
_
[]
string
,
attr
slog
.
Attr
)
slog
.
Attr
{
if
attr
.
Key
==
slog
.
SourceKey
{
source
:=
attr
.
Value
.
Any
()
.
(
*
slog
.
Source
)
source
.
File
=
filepath
.
Base
(
source
.
File
)
}
return
attr
},
})
slog
.
SetDefault
(
slog
.
New
(
handler
))
if
noprune
:=
os
.
Getenv
(
"OLLAMA_NOPRUNE"
);
noprune
==
""
{
// clean up unused layers and manifests
if
err
:=
PruneLayers
();
err
!=
nil
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment