From 4e039a9bce01508e4925bd22469484983ae327f5 Mon Sep 17 00:00:00 2001 From: XMRig Date: Tue, 22 Aug 2017 11:16:33 +0300 Subject: [PATCH] #68 Fixed console output in docker containers. --- src/log/ConsoleLog.cpp | 7 ++++++- src/version.h | 4 ++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/log/ConsoleLog.cpp b/src/log/ConsoleLog.cpp index 6439eb07a..1ea81a395 100644 --- a/src/log/ConsoleLog.cpp +++ b/src/log/ConsoleLog.cpp @@ -133,7 +133,12 @@ void ConsoleLog::text(const char* fmt, va_list args) bool ConsoleLog::isWritable() const { - return uv_is_writable(reinterpret_cast(&m_tty)) == 1 && uv_guess_handle(1) == UV_TTY; + if (uv_is_writable(reinterpret_cast(&m_tty)) != 1) { + return false; + } + + const uv_handle_type type = uv_guess_handle(1); + return type == UV_TTY || type == UV_NAMED_PIPE; } diff --git a/src/version.h b/src/version.h index 4e55f7865..2a0818a5e 100644 --- a/src/version.h +++ b/src/version.h @@ -27,14 +27,14 @@ #define APP_ID "xmrig" #define APP_NAME "XMRig" #define APP_DESC "XMRig CPU miner" -#define APP_VERSION "2.3.0" +#define APP_VERSION "2.3.1-dev" #define APP_DOMAIN "xmrig.com" #define APP_SITE "www.xmrig.com" #define APP_COPYRIGHT "Copyright (C) 2016-2017 xmrig.com" #define APP_VER_MAJOR 2 #define APP_VER_MINOR 3 -#define APP_VER_BUILD 0 +#define APP_VER_BUILD 1 #define APP_VER_REV 0 #ifdef _MSC_VER