From 9297ff8330381e0e1e42db3af2e674413a33ba37 Mon Sep 17 00:00:00 2001 From: Michael Yang Date: Wed, 20 Sep 2023 17:49:48 -0700 Subject: [PATCH] fix OLLAMA_HOST parsing for ip6 --- cmd/cmd.go | 27 +++++++++------------------ 1 file changed, 9 insertions(+), 18 deletions(-) diff --git a/cmd/cmd.go b/cmd/cmd.go index a091cb92..d5f8a157 100644 --- a/cmd/cmd.go +++ b/cmd/cmd.go @@ -655,28 +655,19 @@ func generateBatch(cmd *cobra.Command, model string) error { } func RunServer(cmd *cobra.Command, _ []string) error { - host, port := "127.0.0.1", "11434" - - parts := strings.Split(os.Getenv("OLLAMA_HOST"), ":") - if ip := net.ParseIP(parts[0]); ip != nil { - host = ip.String() - } - - if len(parts) > 1 { - port = parts[1] - } - - // deprecated: include port in OLLAMA_HOST - if p := os.Getenv("OLLAMA_PORT"); p != "" { - port = p - } - - err := initializeKeypair() + host, port, err := net.SplitHostPort(os.Getenv("OLLAMA_HOST")) if err != nil { + host, port = "127.0.0.1", "11434" + if ip := net.ParseIP(os.Getenv("OLLAMA_HOST")); ip != nil { + host = ip.String() + } + } + + if err := initializeKeypair(); err != nil { return err } - ln, err := net.Listen("tcp", fmt.Sprintf("%s:%s", host, port)) + ln, err := net.Listen("tcp", net.JoinHostPort(host, port)) if err != nil { return err }