Refactoring/service logging functional (#793)

client/amnezia_application.cpp

@@ -161,13 +161,15 @@ void AmneziaApplication::init()
     m_engine->load(url);
     m_systemController->setQmlRoot(m_engine->rootObjects().value(0));
 
+    bool enabled = m_settings->isSaveLogs();
 #ifndef Q_OS_ANDROID
-    if (m_settings->isSaveLogs()) {
+    if (enabled) {
         if (!Logger::init()) {
             qWarning() << "Initialization of debug subsystem failed";
         }
     }
 #endif
+    Logger::setServiceLogsEnabled(enabled);
 
 #ifdef Q_OS_WIN
     if (m_parser.isSet("a"))

client/logger.cpp

@@ -99,6 +99,29 @@ void Logger::deInit()
     m_file.close();
 }
 
+bool Logger::setServiceLogsEnabled(bool enabled) {
+#ifdef AMNEZIA_DESKTOP
+    IpcClient *m_IpcClient = new IpcClient;
+
+    if (!m_IpcClient->isSocketConnected()) {
+        if (!IpcClient::init(m_IpcClient)) {
+            qWarning() << "Error occurred when init IPC client";
+            return false;
+        }
+    }
+
+    if (m_IpcClient->Interface()) {
+        m_IpcClient->Interface()->setLogsEnabled(enabled);
+    }
+    else {
+        qWarning() << "Error occurred setting up service logs";
+        return false;
+    }
+#endif
+
+    return true;
+}
+
 QString Logger::userLogsDir()
 {
     return QStandardPaths::writableLocation(QStandardPaths::AppDataLocation) + "/log";
@@ -141,7 +164,9 @@ bool Logger::openLogsFolder()
 bool Logger::openServiceLogsFolder()
 {
     QString path = Utils::systemLogPath();
+#ifdef Q_OS_WIN
     path = "file:///" + path;
+#endif
     QDesktopServices::openUrl(QUrl::fromLocalFile(path));
     return true;
 }
@@ -184,8 +209,7 @@ void Logger::clearServiceLogs()
     }
 
     if (m_IpcClient->Interface()) {
-        m_IpcClient->Interface()->setLogsEnabled(false);
+        m_IpcClient->Interface()->clearLogs();
-        m_IpcClient->Interface()->cleanUp();
     }
     else {
         qWarning() << "Error occurred cleaning up service logs";

client/logger.h

@@ -26,6 +26,7 @@ public:
 
     static bool init();
     static void deInit();
+    static bool setServiceLogsEnabled(bool enabled);
     static bool openLogsFolder();
     static bool openServiceLogsFolder();
     static QString appLogFileNamePath();

client/settings.cpp

@@ -226,6 +226,8 @@ void Settings::setSaveLogs(bool enabled)
         }
     }
 #endif
+    Logger::setServiceLogsEnabled(enabled);
+
     if (enabled) {
         setLogEnableDate(QDateTime::currentDateTime());
     }

ipc/ipc_interface.rep

@@ -21,6 +21,7 @@ class IpcInterface
 
     SLOT( void cleanUp() );
     SLOT( void setLogsEnabled(bool enabled) );
+    SLOT( void clearLogs() );
 
     SLOT( bool createTun(const QString &dev, const QString &subnet) );
     SLOT( bool deleteTun(const QString &dev) );

ipc/ipcserver.cpp

@@ -162,6 +162,10 @@ void IpcServer::cleanUp()
     Logger::cleanUp();
 }
 
+void IpcServer::clearLogs() {
+    Logger::clearLogs();
+}
+
 bool IpcServer::createTun(const QString &dev, const QString &subnet)
 {
     return Router::createTun(dev, subnet);

ipc/ipcserver.h

@@ -26,6 +26,7 @@ public:
     virtual bool checkAndInstallDriver() override;
     virtual QStringList getTapList() override;
     virtual void cleanUp() override;
+    virtual void clearLogs() override;
     virtual void setLogsEnabled(bool enabled) override;
     virtual bool createTun(const QString &dev, const QString &subnet) override;
     virtual bool deleteTun(const QString &dev) override;

service/server/main.cpp

@@ -46,8 +46,6 @@ int main(int argc, char **argv)
 {
     Utils::initializePath(Utils::systemLogPath());
 
-    Logger::init();
-
     if (argc >= 2) {
         qInfo() << "Started as console application";
         return runApplication(argc, argv);