fix race condition

dr3mro · Jan 1, 2025 · 3b9e998 · 3b9e998
1 parent 07c74c1
commit 3b9e998
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 8 deletions.
diff --git a/src/controllers/databasecontroller/databasecontroller.cpp b/src/controllers/databasecontroller/databasecontroller.cpp
@@ -9,12 +9,12 @@
 #include <unordered_set>
 
 #include "database/database.hpp"
+#include "database/databaseconnectionpool.hpp"
 #include "database/watchdog.hpp"
 #include "store/store.hpp"
 #include "utils/global/types.hpp"
 
-DatabaseController::DatabaseController() : watchDog(Store::getObject<WatchDog>()) {}
-
+DatabaseController::DatabaseController() : databaseConnectionPool_(Store::getObject<DatabaseConnectionPool>()), watchDog_(Store::getObject<WatchDog>()) {}
 std::optional<jsoncons::json> DatabaseController::executeQuery(const std::string &query)
 {
     return executer<jsoncons::json>(&Database::executeQuery<jsoncons::json, pqxx::work>, query);

diff --git a/src/controllers/databasecontroller/databasecontroller.hpp b/src/controllers/databasecontroller/databasecontroller.hpp
@@ -18,10 +18,8 @@
 class Case;
 class Service;
 class Appointment;
-
 class Database;
 class WatchDog;
-
 class DatabaseController
 {
    public:
@@ -44,7 +42,8 @@ class DatabaseController
     std::optional<jsoncons::json>                          getPermissions(const std::string &query);
 
    private:
-    std::shared_ptr<WatchDog> watchDog;
+    std::shared_ptr<DatabaseConnectionPool> databaseConnectionPool_;
+    std::shared_ptr<WatchDog>               watchDog_;
 
     template <typename Result, typename Func, typename... Args>
     std::optional<Result> executer(const Func &func, Args &&...args)

diff --git a/src/database/databaseconnectionpool.hpp b/src/database/databaseconnectionpool.hpp
@@ -33,6 +33,7 @@ class DatabaseConnectionPool
     std::deque<std::shared_ptr<Database>> databaseConnections;
     std::mutex                            mutex;
     std::condition_variable               cv;
-    static constexpr std::uint16_t        TIMEOUT     = 2;
-    static constexpr unsigned int         MAX_RETRIES = 5;
+
+    static constexpr std::uint16_t TIMEOUT     = 2;
+    static constexpr unsigned int  MAX_RETRIES = 5;
 };
diff --git a/src/database/databasehandler.hpp b/src/database/databasehandler.hpp
@@ -2,7 +2,9 @@
 
 #include <memory>
 
-#include "database/databaseconnectionpool.hpp"
+class DatabaseConnectionPool;
+class Database;
+
 class DatabaseHanndler
 {
    public: