Commit 09f7dc1

committed

Add HTTP connection timeout

As per https://medium.com/@nate510/don-t-use-go-s-default-http-client-4804cb19f 779#.8j7att7r0

1 parent 78692ce commit 09f7dc1Copy full SHA for 09f7dc1

File tree

1 file changed

-4

lines changed

main.go

1 file changed

-4

lines changed

`‎main.go‎`

Lines changed: 8 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -48,6 +48,10 @@ func main() {`
`48`	`48`	`os.Exit(0)`
`49`	`49`	`}`
`50`	`50`
	`51`	`+ var httpClient = &http.Client{`
	`52`	`+ Timeout: time.Second * 10,`
	`53`	`+ }`
	`54`	`+`
`51`	`55`	`httpheader := "http://"`
`52`	`56`
`53`	`57`	`if *useSsl != "" {`
`@@ -70,7 +74,7 @@ func main() {`
`70`	`74`	`fmt.Println("Resetting the board")`
`71`	`75`	`}`
`72`	`76`
`73`		`- resp, err := http.Post(httpheader+networkAddress+":"+networkPort+*syncEndpoint, "", nil)`
	`77`	`+ resp, err := httpClient.Post(httpheader+networkAddress+":"+networkPort+*syncEndpoint, "", nil)`
`74`	`78`	`if err != nil \|\| resp.StatusCode != syncRetCode {`
`75`	`79`	`if *verbose {`
`76`	`80`	`fmt.Println("Failed to reset the board, upload failed")`
`@@ -88,7 +92,7 @@ func main() {`
`88`	`92`	`timeout := 0`
`89`	`93`
`90`	`94`	`for timeout < 10 {`
`91`		`- resp, err := http.Get(httpheader + networkAddress + ":" + networkPort + *syncEndpoint)`
	`95`	`+ resp, err := httpClient.Get(httpheader + networkAddress + ":" + networkPort + *syncEndpoint)`
`92`	`96`	`if err != nil {`
`93`	`97`	`if *verbose {`
`94`	`98`	`fmt.Println("Failed to reset the board, upload failed")`
`@@ -152,7 +156,7 @@ func main() {`
`152`	`156`	`req.SetBasicAuth(username, password)`
`153`	`157`	`}`
`154`	`158`
`155`		`- resp, err := http.DefaultClient.Do(req)`
	`159`	`+ resp, err := httpClient.Do(req)`
`156`	`160`	`if err != nil {`
`157`	`161`	`if *verbose {`
`158`	`162`	`fmt.Println("Error flashing the sketch")`
`@@ -181,7 +185,7 @@ func main() {`
`181`	`185`	`fmt.Println("Resetting the board")`
`182`	`186`	`}`
`183`	`187`
`184`		`- resp, err := http.Post(httpheader+networkAddress+":"+networkPort+*resetEndpoint, "", nil)`
	`188`	`+ resp, err := httpClient.Post(httpheader+networkAddress+":"+networkPort+*resetEndpoint, "", nil)`
`185`	`189`	`if err != nil {`
`186`	`190`	`if *verbose {`
`187`	`191`	`fmt.Println("Failed to reset the board, please reset maually")`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

Commit 09f7dc1

File tree

1 file changed

1 file changed

`‎main.go‎`

0 commit comments