update app structure

Author: Hsnmsri

.vscode/settings.json

@@ -77,6 +77,8 @@
         "variant": "cpp",
         "forward_list": "cpp",
         "ranges": "cpp",
-        "valarray": "cpp"
+        "valarray": "cpp",
+        "bitset": "cpp",
+        "cfenv": "cpp"
     }
 }

compile

@@ -5,8 +5,8 @@ mkdir -p src/build
 cp src/assets/settings.json src/build -n
 
 # compile project
-g++ -I src/library -I src/library/log -I src/library/settings -I src/library/cpu -I src/library/memory -I src/library/telegram \
-    src/library/log/Log.cpp src/library/settings/Settings.cpp src/library/cpu/CpuMonitor.cpp src/library/memory/MemoryMonitor.cpp src/library/telegram/TelegramMonitor.cpp \
+g++ -I src/library -I src/library/log -I src/library/settings -I src/library/cpu -I src/library/memory -I src/library/telegram -I src/library/app \
+    src/library/log/Log.cpp src/library/settings/Settings.cpp src/library/cpu/CpuMonitor.cpp src/library/memory/MemoryMonitor.cpp src/library/telegram/TelegramMonitor.cpp src/library/app/App.cpp \
     src/main.cpp -o src/build/LinuxMonitoring \
     -pthread -lcurl --std=c++14 -I/usr/local/include -lTgBot -lboost_system -lssl -lcrypto -lpthread
 

src/library/app/App.cpp

@@ -0,0 +1,74 @@
+#include "App.hpp"
+
+App::App(){}
+
+int App::execute()
+{
+    this->checkSetting();
+
+    // set monitoring default status
+    this->isMonitoringEnable = this->settings.getDefaultMonitoringStatus();
+
+    this->printWelcome();
+
+    // Monitoring Objects
+    CpuMonitor cpu(settings.getCpuCheckDuration());
+    MemoryMonitor memory(settings.getMemoryCheckDuration());
+    TelegramMonitor telegram(isMonitoringEnable, cpu, memory, settings, logger);
+
+    // Start Monitoring
+    telegram.startTelegramRequestThread();
+
+    // hold app
+    this->hold(cpu, memory, telegram);
+}
+
+bool App::checkSetting()
+{
+    // load settings
+    if (settings.getSetting())
+    {
+        return true;
+    }
+
+    logger.logToConsole("Failed to load the settings file. Attempting to rebuild configuration...");
+
+    // build settings file
+    if (settings.createSettingsFile())
+    {
+        logger.logToConsole("Settings initializing successfully!");
+        settings.getSetting();
+        return true;
+    }
+
+    return false;
+}
+
+void App::printWelcome()
+{
+    this->logger.logToConsole("Linux Monitoring v" + this->settings.getAppVersion() + " Service Started");
+    this->logger.logToConsole(this->settings.getServerName());
+}
+
+void App::hold(CpuMonitor &cpu, MemoryMonitor &memory, TelegramMonitor &telegram)
+{
+    while (true)
+    {
+        // Start Monitoring
+        if (this->isMonitoringEnable)
+        {
+            cpu.startMonitoring();
+            memory.startMonitoring();
+            telegram.startTelegramNotificationWatchThread();
+        }
+        // Stop Monitoring
+        if (!this->isMonitoringEnable)
+        {
+            cpu.stopMonitoring();
+            memory.stopMonitoring();
+            telegram.stopTelegramNotificationWatchThread();
+        }
+        sleep(1);
+        continue;
+    }
+}

src/library/app/App.hpp

@@ -0,0 +1,23 @@
+#pragma once
+
+#include "log/Log.hpp"
+#include "settings/Settings.hpp"
+#include "cpu/CpuMonitor.hpp"
+#include "memory/MemoryMonitor.hpp"
+#include "telegram/TelegramMonitor.hpp"
+
+class App
+{
+public:
+    App();
+    int execute();
+    bool checkSetting();
+    void printWelcome();
+
+private:
+    Log logger;
+    Settings settings;
+    bool isMonitoringEnable;
+
+    void hold(CpuMonitor &cpu, MemoryMonitor &memory, TelegramMonitor &telegram);
+};

src/main.cpp

@@ -1,16 +1,11 @@
-#include "log/Log.hpp"
-#include "settings/Settings.hpp"
-#include "cpu/CpuMonitor.hpp"
-#include "memory/MemoryMonitor.hpp"
-#include "telegram/TelegramMonitor.hpp"
-
-int app();
+#include "app/App.hpp"
 
 int main()
 {
     try
     {
-        return app();
+        App app;
+        app.execute();
     }
     catch (const std::exception &e)
     {
@@ -19,62 +14,4 @@ int main()
     }
 
     return 0;
-}
-
-int app()
-{
-    // Objects
-    Log logger;
-    Settings settings;
-    bool isMonitoringEnable;
-
-    // Get settings from setting file
-    if (!settings.getSetting())
-    {
-        logger.logToConsole("Failed to load setting file . building setting...");
-
-        // build setting file
-        if (!settings.createSettingsFile())
-        {
-            logger.logToConsole("Failed to create setting(settings.json) file");
-            return 1;
-        }
-
-        settings.getSetting();
-    }
-
-    // set monitoring default status
-    isMonitoringEnable = settings.getDefaultMonitoringStatus();
-
-    logger.logToConsole("Linux Monitoring v" + settings.getAppVersion() + " Service Started");
-    logger.logToConsole(settings.getServerName());
-
-    // Monitoring Objects
-    CpuMonitor cpu(settings.getCpuCheckDuration());
-    MemoryMonitor memory(settings.getMemoryCheckDuration());
-    TelegramMonitor telegram(isMonitoringEnable, cpu, memory, settings, logger);
-
-    // Start Monitoring
-    telegram.startTelegramRequestThread();
-
-    // App holder
-    while (true)
-    {
-        // Start Monitoring
-        if (isMonitoringEnable)
-        {
-            cpu.startMonitoring();
-            memory.startMonitoring();
-            telegram.startTelegramNotificationWatchThread();
-        }
-        // Stop Monitoring
-        if (!isMonitoringEnable)
-        {
-            cpu.stopMonitoring();
-            memory.stopMonitoring();
-            telegram.stopTelegramNotificationWatchThread();
-        }
-        sleep(1);
-        continue;
-    }
 }