Renamed global variables

Author: sea5kg

.gitignore

@@ -1,5 +1,7 @@
 tmp/*
 wsjcpp-core
+.vscode/*
+*.log
 
 # Prerequisites
 *.d

src/main.cpp

@@ -7,8 +7,16 @@ int main(int argc, char* argv[]) {
     std::string TAG = "MAIN";
     std::string appName = std::string(WSJCPP_NAME);
     std::string appVersion = std::string(WSJCPP_VERSION);
+    WSJCppLog::setPrefixLogFile("wsjcpp_core");
+    WSJCppLog::info(TAG, "Hello");
 
-    // TODO
-
+    WSJCppCore::init(
+        argc, argv, 
+        std::string(WSJCPP_NAME),
+        std::string(WSJCPP_VERSION),
+        "Evgenii Sopov",
+        ""
+    );
+    
     return 0;
 }

src/wsjcpp_core.cpp

@@ -380,21 +380,23 @@ std::string WSJCppCore::createUuid() {
 // WSJCppLog
 
 // Last log messages
-std::deque<std::string> *g_LAST_LOG_MESSAGES = NULL;
-std::mutex *g_LOG_MUTEX = NULL;
-std::string WSJCppLog::g_LOG_DIR = "./";
-std::string WSJCppLog::g_LOG_FILE = "";
-std::string WSJCppLog::g_PREFIX_LOG_FILE = "";
-long WSJCppLog::g_LOG_START_TIME = 0;
+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 = "";
+long WSJCppLog::g_WSJCPP_LOG_START_TIME = 0;
 
 // ---------------------------------------------------------------------
 
 void WSJCppLog::doLogRotateUpdateFilename(bool bForce) {
     long t = WSJCppCore::currentTime_seconds();
     long nEverySeconds = 51000; // rotate log if started now or if time left more then 1 day
-    if (g_LOG_START_TIME == 0 || t - g_LOG_START_TIME > nEverySeconds || bForce) {
-        g_LOG_START_TIME = t;
-        g_LOG_FILE = g_LOG_DIR + "/" + WSJCppLog::g_PREFIX_LOG_FILE + "_" + WSJCppCore::formatTimeForFilename(g_LOG_START_TIME) + ".log";
+    if (g_WSJCPP_LOG_START_TIME == 0 || t - g_WSJCPP_LOG_START_TIME > nEverySeconds || bForce) {
+        g_WSJCPP_LOG_START_TIME = t;
+        g_WSJCPP_LOG_FILE = g_WSJCPP_LOG_DIR + "/"
+            + WSJCppLog::g_WSJCPP_LOG_PREFIX_FILE + "_"
+            + WSJCppCore::formatTimeForFilename(g_WSJCPP_LOG_START_TIME) + ".log";
     }
 }
 
@@ -437,28 +439,28 @@ void WSJCppLog::ok(const std::string &sTag, const std::string &sMessage) {
 // ---------------------------------------------------------------------
 
 void WSJCppLog::setLogDirectory(const std::string &sDirectoryPath) {
-    WSJCppLog::g_LOG_DIR = sDirectoryPath;
+    WSJCppLog::g_WSJCPP_LOG_DIR = sDirectoryPath;
     WSJCppLog::doLogRotateUpdateFilename(true);
 }
 
 // ---------------------------------------------------------------------
 
 void WSJCppLog::setPrefixLogFile(const std::string &sPrefixLogFile) {
-    WSJCppLog::g_PREFIX_LOG_FILE = sPrefixLogFile;
+    WSJCppLog::g_WSJCPP_LOG_PREFIX_FILE = sPrefixLogFile;
     WSJCppLog::doLogRotateUpdateFilename(true);
 }
 
 // ---------------------------------------------------------------------
 
 void WSJCppLog::initGlobalVariables() {
     // create deque if not created
-    if (g_LAST_LOG_MESSAGES == NULL) {
-        g_LAST_LOG_MESSAGES = new std::deque<std::string>();
+    if (WSJCppLog::g_WSJCPP_LOG_LAST_MESSAGES == nullptr) {
+        WSJCppLog::g_WSJCPP_LOG_LAST_MESSAGES = new std::deque<std::string>();
         // std::cout << WSJCppCore::currentTime_logformat() + ", " + WSJCppCore::threadId() + " Init last messages deque\r\n";
     }
     // create mutex if not created
-    if (g_LOG_MUTEX == NULL) {
-        g_LOG_MUTEX = new std::mutex();
+    if (WSJCppLog::g_WSJCPP_LOG_MUTEX == nullptr) {
+        WSJCppLog::g_WSJCPP_LOG_MUTEX = new std::mutex();
         // std::cout << WSJCppCore::currentTime_logformat() + ", " + WSJCppCore::threadId() + " Init mutex for log\r\n";
     }
 }
@@ -469,19 +471,19 @@ void WSJCppLog::add(WSJCppColorModifier &clr, const std::string &sType, const st
     WSJCppLog::initGlobalVariables();
     WSJCppLog::doLogRotateUpdateFilename();
 
-    std::lock_guard<std::mutex> lock(*g_LOG_MUTEX);
+    std::lock_guard<std::mutex> lock(*WSJCppLog::g_WSJCPP_LOG_MUTEX);
     WSJCppColorModifier def(WSJCppColorCode::FG_DEFAULT);
 
     std::string sLogMessage = WSJCppCore::currentTime_logformat() + ", " + WSJCppCore::threadId()
          + " [" + sType + "] " + sTag + ": " + sMessage;
     std::cout << clr << sLogMessage << def << std::endl;
 
-    g_LAST_LOG_MESSAGES->push_front(sLogMessage);
-    while (g_LAST_LOG_MESSAGES->size() > 50) {
-        g_LAST_LOG_MESSAGES->pop_back();
+    g_WSJCPP_LOG_LAST_MESSAGES->push_front(sLogMessage);
+    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_LOG_FILE, std::ios::app);
+    std::ofstream logFile(WSJCppLog::g_WSJCPP_LOG_FILE, std::ios::app);
     if (!logFile) {
         std::cout << "Error Opening File" << std::endl;
         return;

src/wsjcpp_core.h

@@ -80,10 +80,12 @@ class WSJCppColorModifier {
 
 class WSJCppLog {
     public:
-        static std::string g_LOG_DIR;
-        static std::string g_PREFIX_LOG_FILE;
-        static std::string g_LOG_FILE;
-        static long g_LOG_START_TIME;
+        static std::string g_WSJCPP_LOG_DIR;
+        static std::string g_WSJCPP_LOG_PREFIX_FILE;
+        static std::string g_WSJCPP_LOG_FILE;
+        static long g_WSJCPP_LOG_START_TIME;
+        static std::mutex * g_WSJCPP_LOG_MUTEX;
+        static std::deque<std::string> * g_WSJCPP_LOG_LAST_MESSAGES;
         static void doLogRotateUpdateFilename(bool bForce = false);
 
         static void info(const std::string &sTag, const std::string &sMessage);