Fix bug in server interruption handling

fagossa · fagossa · commit 5e3ee788fd20 · 2019-10-05T14:48:28.000+02:00
diff --git a/.travis.yml b/.travis.yml
@@ -2,7 +2,6 @@ language: go
 
 go:
 - 1.13.x
-- master
 
 script:
   - make test
diff --git a/cmd/api/main.go b/cmd/api/main.go
@@ -56,8 +56,7 @@ func main() {
 
 	go func() {
 		logger.Info("Diagnostics server is preparing...")
-		diag.ListenAndServe()
-		err := server.ListenAndServe()
+		err := diag.ListenAndServe()
 		if err != nil && err != http.ErrServerClosed {
 			shutdown <- err
 		}

-Original file line number
+Diff line change
 go:
 - 1.13.x
 -- master
 script:
   - make test
Original file line number	Diff line number	Diff line change
`@@ -56,8 +56,7 @@ func main() {`
`56`	`56`
`57`	`57`	`go func() {`
`58`	`58`	`logger.Info("Diagnostics server is preparing...")`
`59`		`- diag.ListenAndServe()`
`60`		`- err := server.ListenAndServe()`
	`59`	`+ err := diag.ListenAndServe()`
`61`	`60`	`if err != nil && err != http.ErrServerClosed {`
`62`	`61`	`shutdown <- err`
`63`	`62`	`}`