From 552cc014d91dee258740b13f7e601e51f4e25a25 Mon Sep 17 00:00:00 2001 From: vadym Date: Wed, 7 Dec 2022 18:48:44 +0200 Subject: [PATCH] Dialer timeout equals 5sec for ctl requests --- cmd/meshctl/main.go | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/cmd/meshctl/main.go b/cmd/meshctl/main.go index 0aba84ea..3db2b499 100644 --- a/cmd/meshctl/main.go +++ b/cmd/meshctl/main.go @@ -13,12 +13,12 @@ import ( "strings" "time" - "github.com/olekukonko/tablewriter" "github.com/RiV-chain/RiV-mesh/src/admin" "github.com/RiV-chain/RiV-mesh/src/core" "github.com/RiV-chain/RiV-mesh/src/multicast" "github.com/RiV-chain/RiV-mesh/src/tun" "github.com/RiV-chain/RiV-mesh/src/version" + "github.com/olekukonko/tablewriter" ) func main() { @@ -58,21 +58,22 @@ func run() int { var conn net.Conn u, err := url.Parse(cmdLineEnv.endpoint) + d := net.Dialer{Timeout: 5000 * time.Millisecond} if err == nil { switch strings.ToLower(u.Scheme) { case "unix": logger.Println("Connecting to UNIX socket", cmdLineEnv.endpoint[7:]) - conn, err = net.Dial("unix", cmdLineEnv.endpoint[7:]) + conn, err = d.Dial("unix", cmdLineEnv.endpoint[7:]) case "tcp": logger.Println("Connecting to TCP socket", u.Host) - conn, err = net.Dial("tcp", u.Host) + conn, err = d.Dial("tcp", u.Host) default: logger.Println("Unknown protocol or malformed address - check your endpoint") err = errors.New("protocol not supported") } } else { logger.Println("Connecting to TCP socket", u.Host) - conn, err = net.Dial("tcp", cmdLineEnv.endpoint) + conn, err = d.Dial("tcp", cmdLineEnv.endpoint) } if err != nil { panic(err)