refactoring

mxssl · Nov 12, 2020 · 5a6ff41 · 5a6ff41
1 parent a40194f
commit 5a6ff41
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 8 deletions.
diff --git a/api/restapi/configure_todo.go b/api/restapi/configure_todo.go
@@ -66,7 +66,7 @@ func configureAPI(api *operations.TodoAPI) http.Handler {
 
 	api.PreServerShutdown = func() {}
 
-	// api.ServerShutdown = func() {}
+	api.ServerShutdown = func() {}
 
 	return setupGlobalMiddleware(api.Serve(setupMiddlewares))
 }

diff --git a/cmd/todo-server/main.go b/cmd/todo-server/main.go
@@ -53,12 +53,8 @@ func main() {
 	}
 
 	api := operations.NewTodoAPI(swaggerSpec)
-	api.ServerShutdown = func() {
-		d.Close()
-		log.Println("Database connection pool closed")
-	}
 	server := restapi.NewServer(api)
-	defer server.Shutdown()
+
 	handlers.Init(itemStore, api)
 
 	parser := flags.NewParser(server, flags.Default)
@@ -79,12 +75,21 @@ func main() {
 				code = 0
 			}
 		}
-		os.Exit(code)
+		if code != 0 {
+			log.Fatalln(code)
+		}
 	}
 
 	server.ConfigureAPI()
 
 	if err := server.Serve(); err != nil {
-		log.Fatalln(err)
+		log.Println(err)
 	}
+
+	if err := server.Shutdown(); err != nil {
+		log.Println(err)
+	}
+
+	d.Close()
+	log.Println("Database connection pool closed")
 }