Fixed #10 added WsjcppLog::setEnableLogFile

Author: sea5kg

README.md

@@ -32,12 +32,10 @@ In main() you need to init logger first.
 
 int main(int argc, char* argv[]) {
     std::string TAG = "MAIN";
-    if (!WsjcppCore::dirExists(".logs")) {
-        WsjcppCore::makeDir(".logs");
-    }
     WsjcppLog::setLogDirectory(".logs");
     WsjcppLog::setPrefixLogFile("app");
-
+    // disable log file
+    // WsjcppLog::setEnableLogFile(false);
     // ... 
     return 0;
 }

src/main.cpp

@@ -8,9 +8,7 @@ int main(int argc, char* argv[]) {
     std::string appName = std::string(WSJCPP_APP_NAME);
     std::string appVersion = std::string(WSJCPP_APP_VERSION);
 
-    if (!WsjcppCore::dirExists(".logs")) {
-        WsjcppCore::makeDir(".logs");
-    }
+    // WsjcppLog::setEnableLogFile(false);
     WsjcppLog::setLogDirectory(".logs");
     WsjcppLog::setPrefixLogFile("wsjcpp_core");
 

src/wsjcpp_core.cpp

@@ -746,15 +746,17 @@ bool WsjcppCore::recoursiveRemoveDir(const std::string& sDir) {
 // ---------------------------------------------------------------------
 // WsjcppLog
 
-// Last log messages
-std::deque<std::string> * WsjcppLog::g_WSJCPP_LOG_LAST_MESSAGES = nullptr;
 std::mutex * WsjcppLog::g_WSJCPP_LOG_MUTEX = nullptr;
 std::string WsjcppLog::g_WSJCPP_LOG_DIR = "./";
 std::string WsjcppLog::g_WSJCPP_LOG_FILE = "";
 std::string WsjcppLog::g_WSJCPP_LOG_PREFIX_FILE = "";
+bool WsjcppLog::g_WSJCPP_ENABLE_LOG_FILE = true;
 long WsjcppLog::g_WSJCPP_LOG_START_TIME = 0;
 long WsjcppLog::g_WSJCPP_LOG_ROTATION_PERIOD_IN_SECONDS = 51000;
 
+// Last log messages
+std::deque<std::string> * WsjcppLog::g_WSJCPP_LOG_LAST_MESSAGES = nullptr;
+
 // ---------------------------------------------------------------------
 
 void WsjcppLog::doLogRotateUpdateFilename(bool bForce) {
@@ -820,6 +822,11 @@ std::vector<std::string> WsjcppLog::getLastLogMessages() {
 
 void WsjcppLog::setLogDirectory(const std::string &sDirectoryPath) {
     WsjcppLog::g_WSJCPP_LOG_DIR = sDirectoryPath;
+    if (!WsjcppCore::dirExists(WsjcppLog::g_WSJCPP_LOG_DIR)) {
+        if (!WsjcppCore::makeDir(WsjcppLog::g_WSJCPP_LOG_DIR)) {
+            WsjcppLog::err("setLogDirectory", "Could not create log directory '" + sDirectoryPath + "'");
+        }
+    }
     WsjcppLog::doLogRotateUpdateFilename(true);
 }
 
@@ -832,9 +839,14 @@ void WsjcppLog::setPrefixLogFile(const std::string &sPrefixLogFile) {
 
 // ---------------------------------------------------------------------
 
+void WsjcppLog::setEnableLogFile(bool bEnable) {
+    WsjcppLog::g_WSJCPP_ENABLE_LOG_FILE = bEnable;
+}
+
+// ---------------------------------------------------------------------
+
 void WsjcppLog::setRotationPeriodInSec(long nRotationPeriodInSec) {
     WsjcppLog::g_WSJCPP_LOG_ROTATION_PERIOD_IN_SECONDS = nRotationPeriodInSec;
-
 }
 
 // ---------------------------------------------------------------------
@@ -876,15 +888,18 @@ void WsjcppLog::add(WsjcppColorModifier &clr, const std::string &sType, const st
     while (g_WSJCPP_LOG_LAST_MESSAGES->size() > 50) {
         g_WSJCPP_LOG_LAST_MESSAGES->pop_back();
     }
-    // TODO try create global variable
-    std::ofstream logFile(WsjcppLog::g_WSJCPP_LOG_FILE, std::ios::app);
-    if (!logFile) {
-        std::cout << "Error Opening File" << std::endl;
-        return;
-    }
 
-    logFile << sLogMessage << std::endl;
-    logFile.close();
+    // log file
+    if (WsjcppLog::g_WSJCPP_ENABLE_LOG_FILE) {
+        std::ofstream logFile(WsjcppLog::g_WSJCPP_LOG_FILE, std::ios::app);
+        if (!logFile) {
+            std::cout << "Error Opening File" << std::endl;
+            return;
+        }
+
+        logFile << sLogMessage << std::endl;
+        logFile.close();    
+    }
 }
 
 

src/wsjcpp_core.h

@@ -107,6 +107,7 @@ class WsjcppLog {
         static std::string g_WSJCPP_LOG_DIR;
         static std::string g_WSJCPP_LOG_PREFIX_FILE;
         static std::string g_WSJCPP_LOG_FILE;
+        static bool g_WSJCPP_ENABLE_LOG_FILE;
         static long g_WSJCPP_LOG_START_TIME;
         static long g_WSJCPP_LOG_ROTATION_PERIOD_IN_SECONDS;
         static std::mutex * g_WSJCPP_LOG_MUTEX;
@@ -121,6 +122,7 @@ class WsjcppLog {
         static std::vector<std::string> getLastLogMessages();
         static void setLogDirectory(const std::string &sDirectoryPath);
         static void setPrefixLogFile(const std::string &sPrefixLogFile);
+        static void setEnableLogFile(bool bEnable);
         static void setRotationPeriodInSec(long nRotationPeriodInSec);
         static void initGlobalVariables();
         static void deinitGlobalVariables();