From 234aadadd9f96b5c601bf2864e1850c3b4757a14 Mon Sep 17 00:00:00 2001 From: Yuhui Xu Date: Mon, 2 Aug 2021 18:46:43 +0800 Subject: [PATCH] frontend: specify timeout for requests (#29) --- frontend/lgproxy.go | 4 +++- frontend/whois.go | 3 ++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/frontend/lgproxy.go b/frontend/lgproxy.go index ff4f5da..d5f8906 100644 --- a/frontend/lgproxy.go +++ b/frontend/lgproxy.go @@ -6,6 +6,7 @@ import ( "net/url" "strconv" "strings" + "time" ) type channelData struct { @@ -46,7 +47,8 @@ func batchRequest(servers []string, endpoint string, command string) []string { } url := "http://" + hostname + ":" + strconv.Itoa(setting.proxyPort) + "/" + url.PathEscape(endpoint) + "?q=" + url.QueryEscape(command) go func(url string, i int) { - response, err := http.Get(url) + client := http.Client{Timeout: 5 * time.Second} + response, err := client.Get(url) if err != nil { ch <- channelData{i, "request failed: " + err.Error() + "\n"} return diff --git a/frontend/whois.go b/frontend/whois.go index 7991ac1..b4cc173 100644 --- a/frontend/whois.go +++ b/frontend/whois.go @@ -3,6 +3,7 @@ package main import ( "io/ioutil" "net" + "time" ) // Send a whois request @@ -11,7 +12,7 @@ func whois(s string) string { return "" } - conn, err := net.Dial("tcp", setting.whoisServer+":43") + conn, err := net.DialTimeout("tcp", setting.whoisServer+":43", 5*time.Second) if err != nil { return err.Error() }