redo server and graceful shutdown

puellanivis · May 7, 2019 · 1a086ec · 1a086ec
1 parent bf47f3f
commit 1a086ec
Showing 1 changed file with 13 additions and 11 deletions.
diff --git a/dashcat.go b/dashcat.go
@@ -105,21 +105,23 @@ func main() {
 			srv := &http.Server{}
 
 			go func() {
-				<-ctx.Done()
-
-				ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
-				defer cancel()
+				if err := srv.Serve(l); err != nil {
+					if err != http.ErrServerClosed {
+						glog.Error("http.Server.Serve: ", err)
+					}
+				}
+			}()
 
-				srv.Shutdown(ctx)
+			<-ctx.Done()
 
-				l.Close()
-			}()
+			ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
+			defer cancel()
 
-			if err := srv.Serve(l); err != nil {
-				if err != http.ErrServerClosed {
-					glog.Error(err)
-				}
+			if err := srv.Shutdown(ctx); err != nil {
+				glog.Error("http.Server.Shutdown: ", err)
 			}
+
+			l.Close()
 		}()
 	}