Merge b8da930f7fc806a306a5e9df181cbfdec86a7454 into 0d3b2f444ec0193193cf03eef6d43c6e35b0183e

This commit is contained in:
MirzaSamadAhmedBaig 2025-08-08 03:39:27 -06:00 committed by GitHub
commit 85a3a64b10
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 10 additions and 8 deletions

12
main.go
View File

@ -128,7 +128,8 @@ func main() {
listener, err := net.Listen("tcp", net.JoinHostPort(LOCALHOST, "0"))
if err != nil {
panic(err)
logger.Error("Failed to create TCP listener", zap.Error(err))
return
}
routers := []string{
"/v1/sys",
@ -155,8 +156,8 @@ func main() {
Target: "http://" + listener.Addr().String(),
})
if err != nil {
fmt.Println("err", err)
panic(err)
logger.Error("Failed to create route", zap.Error(err), zap.String("path", apiPath))
continue
}
}
@ -169,7 +170,7 @@ func main() {
if response != nil && response.StatusCode() != http.StatusOK {
logger.Error("error when trying to register one or more event types - some event type will not be discoverable", zap.String("status", response.Status()), zap.String("body", string(response.Body)))
}
if response.StatusCode() == http.StatusOK {
if response != nil && response.StatusCode() == http.StatusOK {
break
}
time.Sleep(time.Second)
@ -224,6 +225,7 @@ func main() {
// defer service.MyService.Storage().UnmountAllStorage()
err = s.Serve(listener) // not using http.serve() to fix G114: Use of net/http serve function that has no support for setting timeouts (see https://github.com/securego/gosec)
if err != nil {
panic(err)
logger.Error("Server failed to start", zap.Error(err))
return
}
}

View File

@ -95,7 +95,7 @@ func Post(url string, data []byte, contentType string, head map[string]string) (
req.Header.Add(k, v)
}
if err != nil {
panic(err)
return ""
}
client := &http.Client{Timeout: 5 * time.Second}
@ -120,14 +120,14 @@ func ZeroTierGet(url string, head map[string]string) (content string, code int)
req.Header.Add(k, v)
}
if err != nil {
panic(err)
return "", 0
}
client := &http.Client{Timeout: 20 * time.Second}
resp, error := client.Do(req)
if error != nil {
panic(error)
return "", 0
}
defer resp.Body.Close()
code = resp.StatusCode