"git@developer.sourcefind.cn:OpenDAS/vision.git" did not exist on "060c10f0271063330d8bd5668274952ad9b5dbfa"
Commit 31e472ba authored by Michael Yang's avatar Michael Yang
Browse files

runner: defer context cancel

defer the cancel to guarantee it runs
parent 657685e8
...@@ -968,13 +968,14 @@ func Execute(args []string) error { ...@@ -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 { ...@@ -994,6 +995,5 @@ func Execute(args []string) error {
return err return err
} }
cancel()
return nil return nil
} }
...@@ -890,13 +890,14 @@ func Execute(args []string) error { ...@@ -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 { ...@@ -916,6 +917,5 @@ func Execute(args []string) error {
return err return err
} }
cancel()
return nil return nil
} }
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment