Fix a bug that timer for TSqlDatabasePool stops. #279

treefrogframework · Dec 1, 2019 · 3272384 · 3272384
1 parent cffa538
commit 3272384
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 4 deletions.
diff --git a/src/thttprequest.cpp b/src/thttprequest.cpp
@@ -499,7 +499,7 @@ void THttpRequest::parseBody(const QByteArray &body, const THttpRequestHeader &h
         } else {
             tSystemWarn("unsupported content-type: %s", qPrintable(ctype));
         }
-        /* FALLTHRU */ }
+        } /* FALLTHRU */
 
     case Tf::Get: {
         // query parameter

diff --git a/src/tmultiplexingserver_linux.cpp b/src/tmultiplexingserver_linux.cpp
@@ -118,6 +118,10 @@ bool TMultiplexingServer::start(bool debugMode)
         }
     }
 
+    // To work a timer in main thread
+    TSqlDatabasePool::instance();
+    TKvsDatabasePool::instance();
+
     TStaticInitializeThread::exec();
     QThread::start();
     return true;

diff --git a/src/tthreadapplicationserver_linux.cpp b/src/tthreadapplicationserver_linux.cpp
@@ -9,6 +9,8 @@
 #include <TWebApplication>
 #include <TAppSettings>
 #include <TActionThread>
+#include "tsqldatabasepool.h"
+#include "tkvsdatabasepool.h"
 #include "tsystemglobal.h"
 #include "tfcore_unix.h"
 #include <thread>
@@ -61,6 +63,10 @@ bool TThreadApplicationServer::start(bool debugMode)
         return false;
     }
 
+    // To work a timer in main thread
+    TSqlDatabasePool::instance();
+    TKvsDatabasePool::instance();
+
     TStaticInitializeThread::exec();
     QThread::start();
     return true;

diff --git a/src/twebapplication.cpp b/src/twebapplication.cpp
@@ -38,11 +38,11 @@ namespace {
 /*!
   Constructor.
 */
-TWebApplication::TWebApplication(int &argc, char **argv)
+TWebApplication::TWebApplication(int &argc, char **argv) :
 #ifdef TF_USE_GUI_MODULE
-    : QApplication(argc, argv),
+    QApplication(argc, argv),
 #else
-    : QCoreApplication(argc, argv),
+    QCoreApplication(argc, argv),
 #endif
     _dbEnvironment(DEFAULT_DATABASE_ENVIRONMENT)
 {