Merge pull request #16217 from Atlante45/fix/flush-timer

BUGZ-489: Make sure the flush timer is not spawned too early

assignment-client/src/AssignmentClientApp.cpp

@@ -240,6 +240,9 @@ AssignmentClientApp::AssignmentClientApp(int argc, char* argv[]) :
 
     QThread::currentThread()->setObjectName("main thread");
 
+    LogHandler::getInstance().setParent(this);
+    LogHandler::getInstance().setupRepeatedMessageFlusher();
+
     DependencyManager::registerInheritance<LimitedNodeList, NodeList>();
     DependencyManager::set<ScriptInitializers>();
 

domain-server/src/DomainServer.cpp

@@ -174,6 +174,9 @@ DomainServer::DomainServer(int argc, char* argv[]) :
 
     LogUtils::init();
 
+    LogHandler::getInstance().setParent(this);
+    LogHandler::getInstance().setupRepeatedMessageFlusher();
+
     qDebug() << "Setting up domain-server";
     qDebug() << "[VERSION] Build sequence:" << qPrintable(applicationVersion());
     qDebug() << "[VERSION] MODIFIED_ORGANIZATION:" << BuildInfo::MODIFIED_ORGANIZATION;

interface/src/Application.cpp

@@ -1060,6 +1060,9 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo
     setProperty(hifi::properties::STEAM, (steamClient && steamClient->isRunning()));
     setProperty(hifi::properties::CRASHED, _previousSessionCrashed);
 
+    LogHandler::getInstance().setParent(this);
+    LogHandler::getInstance().setupRepeatedMessageFlusher();
+
     {
         const QStringList args = arguments();
 

libraries/shared/src/LogHandler.cpp

@@ -32,14 +32,6 @@ LogHandler& LogHandler::getInstance() {
     return staticInstance;
 }
 
-LogHandler::LogHandler() {
-    // make sure we setup the repeated message flusher, but do it on the LogHandler thread	
-    QMetaObject::invokeMethod(this, "setupRepeatedMessageFlusher");
-}
-
-LogHandler::~LogHandler() {
-}
-
 const char* stringForLogType(LogMsgType msgType) {
     switch (msgType) {
         case LogInfo:

libraries/shared/src/LogHandler.h

@@ -54,12 +54,11 @@ public:
     int newRepeatedMessageID();
     void printRepeatedMessage(int messageID, LogMsgType type, const QMessageLogContext& context, const QString &message);
 
-private slots:
     void setupRepeatedMessageFlusher();
 
 private:
-    LogHandler();
+    LogHandler() = default;
-    ~LogHandler();
+    ~LogHandler() = default;
 
     void flushRepeatedMessages();