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

runner: defer context cancel

Browse Source 
defer the cancel to guarantee it runs
This commit is contained in:
Michael Yang
2025-02-28 13:47:45 -08:00
parent 657685e85d
commit 31e472baa4
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
runner/llamarunner/runner.go
View File

@ -968,13 +968,14 @@ func Execute(args []string) error {
server.cond = sync.NewCond(&server.mu) server.cond = sync.NewCond(&server.mu)
ctx, cancel := context.WithCancel(context.Background()) ctx, cancel := context.WithCancel(context.Background())
defer cancel()
go server.run(ctx) go server.run(ctx)
addr := "127.0.0.1:" + strconv.Itoa(*port) addr := "127.0.0.1:" + strconv.Itoa(*port)
listener, err := net.Listen("tcp", addr) listener, err := net.Listen("tcp", addr)
if err != nil { if err != nil {
fmt.Println("Listen error:", err) fmt.Println("Listen error:", err)
cancel()
return err return err
} }
defer listener.Close() defer listener.Close()
@ -994,6 +995,5 @@ func Execute(args []string) error {
return err return err
} }
cancel()
return nil return nil
} }

4
runner/ollamarunner/runner.go
View File

@ -890,13 +890,14 @@ func Execute(args []string) error {
server.cond = sync.NewCond(&server.mu) server.cond = sync.NewCond(&server.mu)
ctx, cancel := context.WithCancel(context.Background()) ctx, cancel := context.WithCancel(context.Background())
defer cancel()
go server.run(ctx) go server.run(ctx)
addr := "127.0.0.1:" + strconv.Itoa(*port) addr := "127.0.0.1:" + strconv.Itoa(*port)
listener, err := net.Listen("tcp", addr) listener, err := net.Listen("tcp", addr)
if err != nil { if err != nil {
fmt.Println("Listen error:", err) fmt.Println("Listen error:", err)
cancel()
return err return err
} }
defer listener.Close() defer listener.Close()
@ -916,6 +917,5 @@ func Execute(args []string) error {
return err return err
} }
cancel()
return nil return nil
} }