Merge pull request #11 from ktnr/master

Necessary to close db connection in normal app?
oatpp · Dec 29, 2020 · aa05d2b · aa05d2b
2 parents e1a730d + d0765e2
commit aa05d2b
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 13 deletions.
diff --git a/src/App.cpp b/src/App.cpp
@@ -29,15 +29,24 @@ void run() {
 
   auto staticController = StaticController::createShared();
   staticController->addEndpointsToRouter(router);
-
+
+  /* Get connection handler component */
+  OATPP_COMPONENT(std::shared_ptr<oatpp::network::ConnectionHandler>, connectionHandler);
+
+  /* Get connection provider component */
+  OATPP_COMPONENT(std::shared_ptr<oatpp::network::ServerConnectionProvider>, connectionProvider);
+
   /* create server */
+  oatpp::network::Server server(connectionProvider,
+                                connectionHandler);
 
-  oatpp::network::Server server(components.serverConnectionProvider.getObject(),
-                                components.serverConnectionHandler.getObject());
-
-  OATPP_LOGD("Server", "Running on port %s...", components.serverConnectionProvider.getObject()->getProperty("port").toString()->c_str());
+  OATPP_LOGD("Server", "Running on port %s...", connectionProvider->getProperty("port").toString()->c_str());
 
   server.run();
+
+  /* stop db connection pool */
+  OATPP_COMPONENT(std::shared_ptr<oatpp::provider::Provider<oatpp::sqlite::Connection>>, dbConnectionProvider);
+  dbConnectionProvider->stop();
 
 }
 

diff --git a/src/DatabaseComponent.hpp b/src/DatabaseComponent.hpp
@@ -6,29 +6,38 @@
 
 class DatabaseComponent {
 public:
-
+    
   /**
-   * Create database client
+   * Create database connection provider component
    */
-  OATPP_CREATE_COMPONENT(std::shared_ptr<UserDb>, userDb)([] {
+  OATPP_CREATE_COMPONENT(std::shared_ptr<oatpp::provider::Provider<oatpp::sqlite::Connection>>, dbConnectionProvider)([] {
 
     /* Create database-specific ConnectionProvider */
     auto connectionProvider = std::make_shared<oatpp::sqlite::ConnectionProvider>(DATABASE_FILE);
 
     /* Create database-specific ConnectionPool */
-    auto connectionPool = oatpp::sqlite::ConnectionPool::createShared(connectionProvider,
-                                                                      10 /* max-connections */,
-                                                                      std::chrono::seconds(5) /* connection TTL */);
+    return oatpp::sqlite::ConnectionPool::createShared(connectionProvider,
+                                                       10 /* max-connections */,
+                                                       std::chrono::seconds(5) /* connection TTL */);
+
+  }());
+
+  /**
+   * Create database client
+   */
+  OATPP_CREATE_COMPONENT(std::shared_ptr<UserDb>, userDb)([] {
+
+    /* Get database ConnectionProvider component */
+    OATPP_COMPONENT(std::shared_ptr<oatpp::provider::Provider<oatpp::sqlite::Connection>>, connectionProvider);
 
     /* Create database-specific Executor */
-    auto executor = std::make_shared<oatpp::sqlite::Executor>(connectionPool);
+    auto executor = std::make_shared<oatpp::sqlite::Executor>(connectionProvider);
 
     /* Create MyClient database client */
     return std::make_shared<UserDb>(executor);
 
   }());
 
-
 };
 
 #endif //CRUD_DATABASECOMPONENT_HPP