Use long tags.

src/base/base.cmake

@@ -13,6 +13,7 @@ set(HEADERS_BASE
     src/base/io/log/backends/FileLog.h
     src/base/io/log/FileLogWriter.h
     src/base/io/log/Log.h
+    src/base/io/log/Tags.h
     src/base/io/Signals.h
     src/base/io/Watcher.h
     src/base/kernel/Base.h
@@ -81,6 +82,7 @@ set(SOURCES_BASE
     src/base/io/log/backends/FileLog.cpp
     src/base/io/log/FileLogWriter.cpp
     src/base/io/log/Log.cpp
+    src/base/io/log/Tags.cpp
     src/base/io/Signals.cpp
     src/base/io/Watcher.cpp
     src/base/kernel/Base.cpp

src/base/io/log/Log.h

@@ -142,8 +142,11 @@ private:
 #define LOG_NOTICE(x, ...)  xmrig::Log::print(xmrig::Log::NOTICE,  x, ##__VA_ARGS__)
 #define LOG_INFO(x, ...)    xmrig::Log::print(xmrig::Log::INFO,    x, ##__VA_ARGS__)
 #define LOG_VERBOSE(x, ...) if (xmrig::Log::verbose() > 0) { xmrig::Log::print(xmrig::Log::INFO, x, ##__VA_ARGS__); }
-#define LOG_V(x, ...)       if (xmrig::Log::verbose() > 0) { xmrig::Log::print(xmrig::Log::INFO, x, ##__VA_ARGS__); }
-#define LOG_VV(x, ...)      if (xmrig::Log::verbose() > 1) { xmrig::Log::print(xmrig::Log::INFO, x, ##__VA_ARGS__); }
+#define LOG_V1(x, ...)      if (xmrig::Log::verbose() > 0) { xmrig::Log::print(xmrig::Log::INFO, x, ##__VA_ARGS__); }
+#define LOG_V2(x, ...)      if (xmrig::Log::verbose() > 1) { xmrig::Log::print(xmrig::Log::INFO, x, ##__VA_ARGS__); }
+#define LOG_V3(x, ...)      if (xmrig::Log::verbose() > 2) { xmrig::Log::print(xmrig::Log::INFO, x, ##__VA_ARGS__); }
+#define LOG_V4(x, ...)      if (xmrig::Log::verbose() > 3) { xmrig::Log::print(xmrig::Log::INFO, x, ##__VA_ARGS__); }
+#define LOG_V5(x, ...)      if (xmrig::Log::verbose() > 4) { xmrig::Log::print(xmrig::Log::INFO, x, ##__VA_ARGS__); }
 
 #ifdef APP_DEBUG
 #   define LOG_DEBUG(x, ...) xmrig::Log::print(xmrig::Log::DEBUG, x, ##__VA_ARGS__)

src/base/io/log/Tags.cpp

@@ -0,0 +1,93 @@
+/* XMRig
+ * Copyright 2018-2020 SChernykh   <https://github.com/SChernykh>
+ * Copyright 2016-2020 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
+ *
+ *   This program is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+
+#include "base/io/log/Tags.h"
+#include "base/io/log/Log.h"
+
+
+const char *xmrig::Tags::config()
+{
+    static const char *tag = CYAN_BG_BOLD(WHITE_BOLD_S " config  ");
+
+    return tag;
+}
+
+
+const char *xmrig::Tags::network()
+{
+    static const char *tag = BLUE_BG_BOLD(WHITE_BOLD_S " net     ");
+
+    return tag;
+}
+
+
+const char *xmrig::Tags::signal()
+{
+    static const char *tag = YELLOW_BG_BOLD(WHITE_BOLD_S " signal  ");
+
+    return tag;
+}
+
+
+#ifdef XMRIG_MINER_PROJECT
+const char *xmrig::Tags::cpu()
+{
+    static const char *tag = CYAN_BG_BOLD(WHITE_BOLD_S " cpu     ");
+
+    return tag;
+}
+
+
+const char *xmrig::Tags::miner()
+{
+    static const char *tag = MAGENTA_BG_BOLD(WHITE_BOLD_S " miner   ");
+
+    return tag;
+}
+
+
+#ifdef XMRIG_ALGO_RANDOMX
+const char *xmrig::Tags::randomx()
+{
+    static const char *tag = BLUE_BG(WHITE_BOLD_S " randomx ") " ";
+
+    return tag;
+}
+#endif
+#endif
+
+
+#ifdef XMRIG_FEATURE_CUDA
+const char *xmrig::Tags::nvidia()
+{
+    static const char *tag = GREEN_BG_BOLD(WHITE_BOLD_S " nvidia  ");
+
+    return tag;
+}
+#endif
+
+
+#ifdef XMRIG_FEATURE_OPENCL
+const char *xmrig::Tags::opencl()
+{
+    static const char *tag = MAGENTA_BG_BOLD(WHITE_BOLD_S " opencl  ");
+
+    return tag;
+}
+#endif

src/base/io/log/Tags.h

@@ -0,0 +1,58 @@
+/* XMRig
+ * Copyright 2018-2020 SChernykh   <https://github.com/SChernykh>
+ * Copyright 2016-2020 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
+ *
+ *   This program is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef XMRIG_TAGS_H
+#define XMRIG_TAGS_H
+
+
+#include <cstddef>
+#include <cstdint>
+
+
+namespace xmrig {
+
+
+class Tags
+{
+public:
+    static const char *config();
+    static const char *network();
+    static const char *signal();
+
+#   ifdef XMRIG_MINER_PROJECT
+    static const char *cpu();
+    static const char *miner();
+#   ifdef XMRIG_ALGO_RANDOMX
+    static const char *randomx();
+#   endif
+#   endif
+
+#   ifdef XMRIG_FEATURE_CUDA
+    static const char *nvidia();
+#   endif
+
+#   ifdef XMRIG_FEATURE_OPENCL
+    static const char *opencl();
+#   endif
+};
+
+
+} /* namespace xmrig */
+
+
+#endif /* XMRIG_TAGS_H */

src/base/kernel/Base.cpp

@@ -33,6 +33,7 @@
 #include "base/io/log/backends/ConsoleLog.h"
 #include "base/io/log/backends/FileLog.h"
 #include "base/io/log/Log.h"
+#include "base/io/log/Tags.h"
 #include "base/io/Watcher.h"
 #include "base/kernel/interfaces/IBaseListener.h"
 #include "base/kernel/Platform.h"
@@ -285,7 +286,7 @@ void xmrig::Base::addListener(IBaseListener *listener)
 
 void xmrig::Base::onFileChanged(const String &fileName)
 {
-    LOG_WARN("\"%s\" was changed, reloading configuration", fileName.data());
+    LOG_WARN("%s " YELLOW("\"%s\" was changed, reloading configuration"), Tags::config(), fileName.data());
 
     JsonChain chain;
     chain.addFile(fileName);
@@ -293,7 +294,7 @@ void xmrig::Base::onFileChanged(const String &fileName)
     auto config = new Config();
 
     if (!config->read(chain, chain.fileName())) {
-        LOG_ERR("reloading failed");
+        LOG_ERR("%s " RED("reloading failed"), Tags::config());
 
         delete config;
         return;

src/base/kernel/config/BaseConfig.cpp

@@ -27,6 +27,7 @@
 #include "3rdparty/rapidjson/document.h"
 #include "base/io/json/Json.h"
 #include "base/io/log/Log.h"
+#include "base/io/log/Tags.h"
 #include "base/kernel/interfaces/IJsonReader.h"
 #include "version.h"
 
@@ -122,7 +123,7 @@ bool xmrig::BaseConfig::save()
     getJSON(doc);
 
     if (Json::save(m_fileName, doc)) {
-        LOG_NOTICE("configuration saved to: \"%s\"", m_fileName.data());
+        LOG_NOTICE("%s " WHITE_BOLD("configuration saved to: \"%s\""), Tags::config(), m_fileName.data());
         return true;
     }