highperfocused/ollama
1
0
Fork 0
mirror of https://github.com/ollama/ollama.git synced 2025-07-13 00:27:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6482 from ollama/mxyng/client-path

Browse Source 
passthrough OLLAMA_HOST path to client
This commit is contained in:
Michael Yang
2024-08-30 09:40:34 -07:00
committed by GitHub
parent 9468c6824a 386af6c1a0
commit 142cbb722d
2 changed files with 27 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
envconfig/config.go
View File

@ -30,9 +30,7 @@ func Host() *url.URL {
defaultPort = "443"
}
// trim trailing slashes
hostport = strings.TrimRight(hostport, "/")
hostport, path, _ := strings.Cut(hostport, "/")
host, port, err := net.SplitHostPort(hostport)
if err != nil {
host, port = "127.0.0.1", defaultPort
@ -45,15 +43,13 @@ func Host() *url.URL {
if n, err := strconv.ParseInt(port, 10, 32); err != nil || n > 65535 || n < 0 {
slog.Warn("invalid port, using default", "port", port, "default", defaultPort)
return &url.URL{
Scheme: scheme,
Host: net.JoinHostPort(host, defaultPort),
}
port = defaultPort
}
return &url.URL{
Scheme: scheme,
Host: net.JoinHostPort(host, port),
Path: path,
}
}