Merge branch 'work29' into DEV

ServerLMS/Systems/assetsmanager.cpp

@@ -110,6 +110,8 @@ QString AssetsManager::setVersion(QString versionName)
             currentVersionData = version;
             saveVersionToFile(currentVersionData);
 
+            emit signal_setVersion(versionName);
+
             return version->getAbsolutPath();
         }
     }

ServerLMS/Systems/assetsmanager.h

@@ -34,6 +34,7 @@ public:
 
 signals:
     void sigSaveVersion(StreamingVersionData *versionData);
+    void signal_setVersion(QString versionStr);
 
 private:
     UpdateController *updateController;

ServerLMS/Systems/logger.cpp

@@ -55,6 +55,11 @@ void Logger::handleLog(QString msg, LogLevel logLevel)
 {
     QString level;
 
+#ifndef PROJECT_TYPE_DEBUG
+    if(logLevel == DEBUG)
+        return;
+#endif
+
     switch (logLevel)
     {
         case INFO: level = "INFO"; break;

ServerLMS/Systems/updatecontroller.cpp

@@ -38,6 +38,8 @@ void UpdateController::initialize(CommonClientHandler *commonClientHandler,DataP
 
     mutex = new QMutex;
     qDebug() << "UpdateController init thread ID " << QThread::currentThreadId();
+
+    emit sigInitializeFinished();
 }
 
 void UpdateController::changeAssetVersion(QString versionName)

ServerLMS/Systems/updatecontroller.h

@@ -69,6 +69,8 @@ signals:
     void sigErrorRequired(int code);
     void sigUpdateDocs();
 
+    void sigInitializeFinished();
+
 private:
     QList<FileData> clientDataList;
     QList<FileData> serverDataList;