From 6f9835f399444c250e2713df9955b5879f0dda0d Mon Sep 17 00:00:00 2001 From: Oleg Borodin Date: Wed, 17 May 2023 12:59:01 +0200 Subject: [PATCH] context added --- example/cli/netcli.go | 43 +++++++++++++++++++++++++------------------ example/go.mod | 2 +- example/go.sum | 2 ++ 3 files changed, 28 insertions(+), 19 deletions(-) diff --git a/example/cli/netcli.go b/example/cli/netcli.go index b8adc32..d8d1282 100644 --- a/example/cli/netcli.go +++ b/example/cli/netcli.go @@ -7,33 +7,40 @@ package main import ( - "fmt" - "github.com/kindsoldier/dsrpc" - "netsrv/api" + "context" + "fmt" + "time" + + "github.com/kindsoldier/dsrpc" + + "netsrv/api" ) func main() { - err := exec() - if err != nil { - fmt.Println("exec err:", err) - } + err := exec() + if err != nil { + fmt.Println("exec err:", err) + } } func exec() error { - var err error + var err error + + params := api.HelloParams{ + Message: "hello, server!", + } - params := api.HelloParams{ - Message: "hello, server!", - } + result := api.HelloResult{} - result := api.HelloResult{} + ctx, cancel := context.WithTimeout(context.Background(), time.Duration(5*time.Second)) + defer cancel() - err = dsrpc.Exec("127.0.0.1:8081", api.HelloMethod, ¶ms, &result, nil) - if err != nil { - return err - } + err = dsrpc.Exec(ctx, "127.0.0.1:8081", api.HelloMethod, ¶ms, &result, nil) + if err != nil { + return err + } - fmt.Println("result:", result.Message) - return err + fmt.Println("result:", result.Message) + return err } diff --git a/example/go.mod b/example/go.mod index 47e7cc6..1a2bdd8 100644 --- a/example/go.mod +++ b/example/go.mod @@ -2,7 +2,7 @@ module netsrv go 1.19 -require github.com/kindsoldier/dsrpc v1.1.4 +require github.com/kindsoldier/dsrpc v1.2.0 require ( github.com/vmihailenco/msgpack/v5 v5.3.5 // indirect diff --git a/example/go.sum b/example/go.sum index 0ddc5d4..e7616b4 100644 --- a/example/go.sum +++ b/example/go.sum @@ -4,6 +4,8 @@ github.com/kindsoldier/dsrpc v1.1.2 h1:bFTIGpRSMq5OK1a3dHQxLPMxf6R+Ik15slkqNN0Qr github.com/kindsoldier/dsrpc v1.1.2/go.mod h1:KG8x2ZPid/hPJdhkUHtt1mDulWPVhj9fh/1XL3Z2xT8= github.com/kindsoldier/dsrpc v1.1.4 h1:F6e1K5C7C92jKGOrH4lF/XraLe5E2glsQTeVP9avYBE= github.com/kindsoldier/dsrpc v1.1.4/go.mod h1:KG8x2ZPid/hPJdhkUHtt1mDulWPVhj9fh/1XL3Z2xT8= +github.com/kindsoldier/dsrpc v1.2.0 h1:5ZAFeqo6qyFm0OzPZEpabgf49/yMSA1ZKnOhHr4R/5c= +github.com/kindsoldier/dsrpc v1.2.0/go.mod h1:KG8x2ZPid/hPJdhkUHtt1mDulWPVhj9fh/1XL3Z2xT8= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=