Move logging code to common folder.

src/common/api/Httpd.cpp

@@ -30,7 +30,7 @@
 #include "common/api/Httpd.h"
 #include "common/api/HttpReply.h"
 #include "common/api/HttpRequest.h"
-#include "log/Log.h"
+#include "common/log/Log.h"
 
 
 Httpd::Httpd(int port, const char *accessToken, bool IPv6, bool restricted) :

src/common/config/CommonConfig.cpp

@@ -30,8 +30,8 @@
 
 
 #include "common/config/CommonConfig.h"
+#include "common/log/Log.h"
 #include "donate.h"
-#include "log/Log.h"
 #include "rapidjson/document.h"
 #include "rapidjson/filewritestream.h"
 #include "rapidjson/prettywriter.h"

src/common/config/ConfigWatcher.cpp

@@ -27,9 +27,9 @@
 
 #include "common/config/ConfigLoader.h"
 #include "common/config/ConfigWatcher.h"
+#include "common/log/Log.h"
 #include "core/ConfigCreator.h"
 #include "interfaces/IWatcherListener.h"
-#include "log/Log.h"
 
 
 xmrig::ConfigWatcher::ConfigWatcher(const char *path, IConfigCreator *creator, IWatcherListener *listener) :

src/common/crypto/keccak.cpp

@@ -183,7 +183,7 @@ void xmrig::keccak(const uint8_t *in, int inlen, uint8_t *md, int mdlen)
 
         xmrig::keccakf(st, KECCAK_ROUNDS);
     }
-    
+
     // last block and padding
     memcpy(temp, in, inlen);
     temp[inlen++] = 1;

src/common/log/ConsoleLog.cpp

@@ -0,0 +1,156 @@
+/* XMRig
+ * Copyright 2010      Jeff Garzik <jgarzik@pobox.com>
+ * Copyright 2012-2014 pooler      <pooler@litecoinpool.org>
+ * Copyright 2014      Lucas Jones <https://github.com/lucasjones>
+ * Copyright 2014-2016 Wolf9466    <https://github.com/OhGodAPet>
+ * Copyright 2016      Jay D Dee   <jayddee246@gmail.com>
+ * Copyright 2017-2018 XMR-Stak    <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
+ * Copyright 2016-2018 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 <stdarg.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <time.h>
+
+#ifdef WIN32
+#   include <winsock2.h>
+#   include <windows.h>
+#endif
+
+
+#include "common/log/ConsoleLog.h"
+#include "common/log/Log.h"
+#include "core/Config.h"
+#include "core/Controller.h"
+
+
+ConsoleLog::ConsoleLog(xmrig::Controller *controller) :
+    m_stream(nullptr),
+    m_controller(controller)
+{
+    if (uv_tty_init(uv_default_loop(), &m_tty, 1, 0) < 0) {
+        controller->config()->setColors(false);
+        return;
+    }
+
+    uv_tty_set_mode(&m_tty, UV_TTY_MODE_NORMAL);
+    m_uvBuf.base = m_buf;
+    m_stream     = reinterpret_cast<uv_stream_t*>(&m_tty);
+
+#   ifdef WIN32
+    HANDLE handle = GetStdHandle(STD_INPUT_HANDLE);
+    if (handle != INVALID_HANDLE_VALUE) {
+        DWORD mode = 0;
+        if (GetConsoleMode(handle, &mode)) {
+           mode &= ~ENABLE_QUICK_EDIT_MODE;
+           SetConsoleMode(handle, mode | ENABLE_EXTENDED_FLAGS);
+        }
+    }
+#   endif
+}
+
+
+void ConsoleLog::message(int level, const char* fmt, va_list args)
+{
+    time_t now = time(nullptr);
+    tm stime;
+
+#   ifdef _WIN32
+    localtime_s(&stime, &now);
+#   else
+    localtime_r(&now, &stime);
+#   endif
+
+    const char* color = nullptr;
+    const bool colors = m_controller->config()->isColors();
+
+    if (colors) {
+        switch (level) {
+        case Log::ERR:
+            color = Log::kCL_RED;
+            break;
+
+        case Log::WARNING:
+            color = Log::kCL_YELLOW;
+            break;
+
+        case Log::NOTICE:
+            color = Log::kCL_WHITE;
+            break;
+
+        case Log::DEBUG:
+            color = Log::kCL_GRAY;
+            break;
+
+        default:
+            color = "";
+            break;
+        }
+    }
+
+    snprintf(m_fmt, sizeof(m_fmt) - 1, "[%d-%02d-%02d %02d:%02d:%02d]%s %s%s\n",
+             stime.tm_year + 1900,
+             stime.tm_mon + 1,
+             stime.tm_mday,
+             stime.tm_hour,
+             stime.tm_min,
+             stime.tm_sec,
+             colors ? color : "",
+             fmt,
+             colors ? Log::kCL_N : ""
+        );
+
+    print(args);
+}
+
+
+void ConsoleLog::text(const char* fmt, va_list args)
+{
+    snprintf(m_fmt, sizeof(m_fmt) - 1, "%s%s\n", fmt, m_controller->config()->isColors() ? Log::kCL_N : "");
+
+    print(args);
+}
+
+
+bool ConsoleLog::isWritable() const
+{
+    if (!m_stream || uv_is_writable(m_stream) != 1) {
+        return false;
+    }
+
+    const uv_handle_type type = uv_guess_handle(1);
+    return type == UV_TTY || type == UV_NAMED_PIPE;
+}
+
+
+void ConsoleLog::print(va_list args)
+{
+    m_uvBuf.len = vsnprintf(m_buf, sizeof(m_buf) - 1, m_fmt, args);
+    if (m_uvBuf.len <= 0) {
+        return;
+    }
+
+    if (!isWritable()) {
+        fputs(m_buf, stdout);
+        fflush(stdout);
+    }
+    else {
+        uv_try_write(m_stream, &m_uvBuf, 1);
+    }
+}

src/common/log/ConsoleLog.h

@@ -0,0 +1,59 @@
+/* XMRig
+ * Copyright 2010      Jeff Garzik <jgarzik@pobox.com>
+ * Copyright 2012-2014 pooler      <pooler@litecoinpool.org>
+ * Copyright 2014      Lucas Jones <https://github.com/lucasjones>
+ * Copyright 2014-2016 Wolf9466    <https://github.com/OhGodAPet>
+ * Copyright 2016      Jay D Dee   <jayddee246@gmail.com>
+ * Copyright 2017-2018 XMR-Stak    <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
+ * Copyright 2016-2018 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 __CONSOLELOG_H__
+#define __CONSOLELOG_H__
+
+
+#include <uv.h>
+
+
+#include "interfaces/ILogBackend.h"
+
+
+namespace xmrig {
+    class Controller;
+}
+
+
+class ConsoleLog : public ILogBackend
+{
+public:
+    ConsoleLog(xmrig::Controller *controller);
+
+    void message(int level, const char *fmt, va_list args) override;
+    void text(const char *fmt, va_list args) override;
+
+private:
+    bool isWritable() const;
+    void print(va_list args);
+
+    char m_buf[512];
+    char m_fmt[256];
+    uv_buf_t m_uvBuf;
+    uv_stream_t *m_stream;
+    uv_tty_t m_tty;
+    xmrig::Controller *m_controller;
+};
+
+#endif /* __CONSOLELOG_H__ */

src/common/log/FileLog.cpp

@@ -0,0 +1,97 @@
+/* XMRig
+ * Copyright 2010      Jeff Garzik <jgarzik@pobox.com>
+ * Copyright 2012-2014 pooler      <pooler@litecoinpool.org>
+ * Copyright 2014      Lucas Jones <https://github.com/lucasjones>
+ * Copyright 2014-2016 Wolf9466    <https://github.com/OhGodAPet>
+ * Copyright 2016      Jay D Dee   <jayddee246@gmail.com>
+ * Copyright 2016-2017 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 <stdarg.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <time.h>
+
+
+#include "common/log/FileLog.h"
+
+
+FileLog::FileLog(const char *fileName)
+{
+    uv_fs_t req;
+    m_file = uv_fs_open(uv_default_loop(), &req, fileName, O_CREAT | O_APPEND | O_WRONLY, 0644, nullptr);
+    uv_fs_req_cleanup(&req);
+}
+
+
+void FileLog::message(int level, const char* fmt, va_list args)
+{
+    if (m_file < 0) {
+        return;
+    }
+
+    time_t now = time(nullptr);
+    tm stime;
+
+#   ifdef _WIN32
+    localtime_s(&stime, &now);
+#   else
+    localtime_r(&now, &stime);
+#   endif
+
+    char *buf = new char[512];
+    int size = snprintf(buf, 23, "[%d-%02d-%02d %02d:%02d:%02d] ",
+                        stime.tm_year + 1900,
+                        stime.tm_mon + 1,
+                        stime.tm_mday,
+                        stime.tm_hour,
+                        stime.tm_min,
+                        stime.tm_sec);
+
+    size = vsnprintf(buf + size, 512 - size - 1, fmt, args) + size;
+    buf[size] = '\n';
+
+    write(buf, size + 1);
+}
+
+
+void FileLog::text(const char* fmt, va_list args)
+{
+    message(0, fmt, args);
+}
+
+
+
+void FileLog::onWrite(uv_fs_t *req)
+{
+    delete [] static_cast<char *>(req->data);
+
+    uv_fs_req_cleanup(req);
+    delete req;
+}
+
+
+void FileLog::write(char *data, size_t size)
+{
+    uv_buf_t buf = uv_buf_init(data, (unsigned int) size);
+    uv_fs_t *req = new uv_fs_t;
+    req->data = buf.base;
+
+    uv_fs_write(uv_default_loop(), req, m_file, &buf, 1, 0, FileLog::onWrite);
+}

src/common/log/FileLog.h

@@ -0,0 +1,50 @@
+/* XMRig
+ * Copyright 2010      Jeff Garzik <jgarzik@pobox.com>
+ * Copyright 2012-2014 pooler      <pooler@litecoinpool.org>
+ * Copyright 2014      Lucas Jones <https://github.com/lucasjones>
+ * Copyright 2014-2016 Wolf9466    <https://github.com/OhGodAPet>
+ * Copyright 2016      Jay D Dee   <jayddee246@gmail.com>
+ * Copyright 2016-2017 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 __FILELOG_H__
+#define __FILELOG_H__
+
+
+#include <uv.h>
+
+
+#include "interfaces/ILogBackend.h"
+
+
+class FileLog : public ILogBackend
+{
+public:
+    FileLog(const char *fileName);
+
+    void message(int level, const char* fmt, va_list args) override;
+    void text(const char* fmt, va_list args) override;
+
+private:
+    static void onWrite(uv_fs_t *req);
+
+    void write(char *data, size_t size);
+
+    int m_file;
+};
+
+#endif /* __FILELOG_H__ */

src/common/log/Log.cpp

@@ -0,0 +1,84 @@
+/* XMRig
+ * Copyright 2010      Jeff Garzik <jgarzik@pobox.com>
+ * Copyright 2012-2014 pooler      <pooler@litecoinpool.org>
+ * Copyright 2014      Lucas Jones <https://github.com/lucasjones>
+ * Copyright 2014-2016 Wolf9466    <https://github.com/OhGodAPet>
+ * Copyright 2016      Jay D Dee   <jayddee246@gmail.com>
+ * Copyright 2017-2018 XMR-Stak    <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
+ * Copyright 2016-2018 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 <stdarg.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <time.h>
+
+
+#include "common/log/Log.h"
+#include "interfaces/ILogBackend.h"
+
+
+Log *Log::m_self = nullptr;
+
+
+void Log::message(Log::Level level, const char* fmt, ...)
+{
+    uv_mutex_lock(&m_mutex);
+
+    va_list args;
+    va_list copy;
+    va_start(args, fmt);
+
+    for (ILogBackend *backend : m_backends) {
+        va_copy(copy, args);
+        backend->message(level, fmt, copy);
+        va_end(copy);
+    }
+
+    va_end(args);
+
+    uv_mutex_unlock(&m_mutex);
+}
+
+
+void Log::text(const char* fmt, ...)
+{
+    uv_mutex_lock(&m_mutex);
+
+    va_list args;
+    va_list copy;
+    va_start(args, fmt);
+
+    for (ILogBackend *backend : m_backends) {
+        va_copy(copy, args);
+        backend->text(fmt, copy);
+        va_end(copy);
+    }
+
+    va_end(args);
+
+    uv_mutex_unlock(&m_mutex);
+}
+
+
+Log::~Log()
+{
+    for (auto backend : m_backends) {
+        delete backend;
+    }
+}

src/common/log/Log.h

@@ -0,0 +1,102 @@
+/* XMRig
+ * Copyright 2010      Jeff Garzik <jgarzik@pobox.com>
+ * Copyright 2012-2014 pooler      <pooler@litecoinpool.org>
+ * Copyright 2014      Lucas Jones <https://github.com/lucasjones>
+ * Copyright 2014-2016 Wolf9466    <https://github.com/OhGodAPet>
+ * Copyright 2016      Jay D Dee   <jayddee246@gmail.com>
+ * Copyright 2017-2018 XMR-Stak    <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
+ * Copyright 2016-2018 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 __LOG_H__
+#define __LOG_H__
+
+
+#include <assert.h>
+#include <uv.h>
+#include <vector>
+
+
+class ILogBackend;
+
+
+class Log
+{
+public:
+    enum Level {
+        ERR,
+        WARNING,
+        NOTICE,
+        INFO,
+        DEBUG
+    };
+
+    constexpr static const char* kCL_N      = "\x1B[0m";
+    constexpr static const char* kCL_RED    = "\x1B[31m";
+    constexpr static const char* kCL_YELLOW = "\x1B[33m";
+    constexpr static const char* kCL_WHITE  = "\x1B[01;37m";
+
+#   ifdef WIN32
+    constexpr static const char* kCL_GRAY = "\x1B[01;30m";
+#   else
+    constexpr static const char* kCL_GRAY = "\x1B[90m";
+#   endif
+
+    static inline Log* i()                       { assert(m_self != nullptr); return m_self; }
+    static inline void add(ILogBackend *backend) { i()->m_backends.push_back(backend); }
+    static inline void init()                    { if (!m_self) { new Log(); } }
+    static inline void release()                 { assert(m_self != nullptr); delete m_self; }
+
+    void message(Level level, const char* fmt, ...);
+    void text(const char* fmt, ...);
+
+private:
+    inline Log() {
+        assert(m_self == nullptr);
+
+        uv_mutex_init(&m_mutex);
+
+        m_self = this;
+    }
+
+    ~Log();
+
+    static Log *m_self;
+    std::vector<ILogBackend*> m_backends;
+    uv_mutex_t m_mutex;
+};
+
+
+#define LOG_ERR(x, ...)    Log::i()->message(Log::ERR,     x, ##__VA_ARGS__)
+#define LOG_WARN(x, ...)   Log::i()->message(Log::WARNING, x, ##__VA_ARGS__)
+#define LOG_NOTICE(x, ...) Log::i()->message(Log::NOTICE,  x, ##__VA_ARGS__)
+#define LOG_INFO(x, ...)   Log::i()->message(Log::INFO,    x, ##__VA_ARGS__)
+
+#ifdef APP_DEBUG
+#   define LOG_DEBUG(x, ...)      Log::i()->message(Log::DEBUG,   x, ##__VA_ARGS__)
+#else
+#   define LOG_DEBUG(x, ...)
+#endif
+
+#if defined(APP_DEBUG) || defined(APP_DEVEL)
+#   define LOG_DEBUG_ERR(x, ...)  Log::i()->message(Log::ERR,     x, ##__VA_ARGS__)
+#   define LOG_DEBUG_WARN(x, ...) Log::i()->message(Log::WARNING, x, ##__VA_ARGS__)
+#else
+#   define LOG_DEBUG_ERR(x, ...)
+#   define LOG_DEBUG_WARN(x, ...)
+#endif
+
+#endif /* __LOG_H__ */

src/common/log/SysLog.cpp

@@ -0,0 +1,47 @@
+/* XMRig
+ * Copyright 2010      Jeff Garzik <jgarzik@pobox.com>
+ * Copyright 2012-2014 pooler      <pooler@litecoinpool.org>
+ * Copyright 2014      Lucas Jones <https://github.com/lucasjones>
+ * Copyright 2014-2016 Wolf9466    <https://github.com/OhGodAPet>
+ * Copyright 2016      Jay D Dee   <jayddee246@gmail.com>
+ * Copyright 2016-2017 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 <syslog.h>
+
+
+#include "common/log/SysLog.h"
+#include "version.h"
+
+
+SysLog::SysLog()
+{
+    openlog(APP_ID, LOG_PID, LOG_USER);
+}
+
+
+void SysLog::message(int level, const char *fmt, va_list args)
+{
+    vsyslog(level, fmt, args);
+}
+
+
+void SysLog::text(const char *fmt, va_list args)
+{
+    message(LOG_INFO, fmt, args);
+}

src/common/log/SysLog.h

@@ -0,0 +1,40 @@
+/* XMRig
+ * Copyright 2010      Jeff Garzik <jgarzik@pobox.com>
+ * Copyright 2012-2014 pooler      <pooler@litecoinpool.org>
+ * Copyright 2014      Lucas Jones <https://github.com/lucasjones>
+ * Copyright 2014-2016 Wolf9466    <https://github.com/OhGodAPet>
+ * Copyright 2016      Jay D Dee   <jayddee246@gmail.com>
+ * Copyright 2016-2017 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 __SYSLOG_H__
+#define __SYSLOG_H__
+
+
+#include "interfaces/ILogBackend.h"
+
+
+class SysLog : public ILogBackend
+{
+public:
+    SysLog();
+
+    void message(int level, const char *fmt, va_list args) override;
+    void text(const char *fmt, va_list args) override;
+};
+
+#endif /* __SYSLOG_BACKEND_H__ */

src/common/net/Client.cpp

@@ -29,9 +29,9 @@
 #include <utility>
 
 
+#include "common/log/Log.h"
 #include "common/net/Client.h"
 #include "interfaces/IClientListener.h"
-#include "log/Log.h"
 #include "rapidjson/document.h"
 #include "rapidjson/error/en.h"
 #include "rapidjson/stringbuffer.h"

src/common/net/Storage.h

@@ -28,7 +28,8 @@
 #include <assert.h>
 #include <map>
 
-#include "log/Log.h"
+
+#include "common/log/Log.h"
 
 
 namespace xmrig {