From 260564cff16b37025951f6ad6e276e206e194180 Mon Sep 17 00:00:00 2001 From: SChernykh Date: Sun, 1 Jan 2023 22:12:16 +0100 Subject: [PATCH] Check for `NO_COLOR` before logging starts --- src/log.cpp | 10 ++++++++++ src/params.cpp | 10 ---------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/log.cpp b/src/log.cpp index 6a6c220..85513b5 100644 --- a/src/log.cpp +++ b/src/log.cpp @@ -21,6 +21,11 @@ #include #include #include +#include + +#ifdef _MSC_VER +#pragma warning(disable : 4996) +#endif static constexpr char log_category_prefix[] = "Log "; static constexpr char log_file_name[] = "p2pool.log"; @@ -86,6 +91,11 @@ public: } #endif + const char* no_color = getenv("NO_COLOR"); + if (no_color && *no_color) { + CONSOLE_COLORS = false; + } + LOGINFO(0, "started"); if (!m_logFile.is_open()) { diff --git a/src/params.cpp b/src/params.cpp index d105812..8cd894e 100644 --- a/src/params.cpp +++ b/src/params.cpp @@ -19,11 +19,6 @@ #include "params.h" #include "stratum_server.h" #include "p2p_server.h" -#include - -#ifdef _MSC_VER -#pragma warning(disable : 4996) -#endif void p2pool_usage(); @@ -31,11 +26,6 @@ namespace p2pool { Params::Params(int argc, char* argv[]) { - const char* no_color = getenv("NO_COLOR"); - if (no_color && *no_color) { - log::CONSOLE_COLORS = false; - } - for (int i = 1; i < argc; ++i) { bool ok = false;