source/xmrig-proxy
1
0
Fork 0
mirror of https://github.com/xmrig/xmrig-proxy.git synced 2026-02-09 02:59:17 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev'

Browse Source
This commit is contained in:
XMRig
2019-03-10 11:39:04 +07:00
parent 55bed257de 46d4799c43
commit aae906e5d3
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/log/AccessLog.cpp
View File

@@ -69,7 +69,7 @@ void xmrig::AccessLog::onEvent(IEvent *event)
{
case IEvent::LoginType: {
auto e = static_cast<LoginEvent*>(event);
write("#%" PRId64 " login: %s, \"%s\", ua: \"%s\", count: %" PRIu64, e->miner()->id(), e->miner()->ip(), e->miner()->user(), e->miner()->agent(), Counters::miners());
write("#%" PRId64 " login: %s, \"%s\", ua: \"%s\", count: %" PRIu64, e->miner()->id(), e->miner()->ip(), e->miner()->user().data(), e->miner()->agent().data(), Counters::miners());
}
break;
@@ -82,7 +82,7 @@ void xmrig::AccessLog::onEvent(IEvent *event)
const double time = (double)(xmrig::currentMSecsSinceEpoch() - e->miner()->timestamp()) / 1000;
write("#%" PRId64 " close: %s, \"%s\", time: %03.1fs, rx/tx: %" PRIu64 "/%" PRIu64 ", count: %" PRIu64,
e->miner()->id(), e->miner()->ip(), e->miner()->user(), time, e->miner()->rx(), e->miner()->tx(), Counters::miners());
e->miner()->id(), e->miner()->ip(), e->miner()->user().data(), time, e->miner()->rx(), e->miner()->tx(), Counters::miners());
}
break;

2
src/proxy/Login.cpp
View File

@@ -103,5 +103,5 @@ void xmrig::Login::reject(LoginEvent *event, const char *message)
LOG_INFO(m_controller->config()->isColors() ? RED_BOLD("deny") " " WHITE_BOLD("\"%s\"") " from " CYAN_BOLD("%s") WHITE_BOLD(" (%s)") " reason " RED("\"%s\"")
: "deny \"%s\" from %s (%s) reason \"%s\"",
event->miner()->rigId(true), event->miner()->ip(), event->miner()->agent(), message);
event->miner()->rigId(true).data(), event->miner()->ip(), event->miner()->agent().data(), message);
}

4
src/proxy/ProxyDebug.cpp
View File

@@ -71,7 +71,7 @@ void xmrig::ProxyDebug::onEvent(IEvent *event)
case IEvent::LoginType: {
auto e = static_cast<LoginEvent*>(event);
LOG_INFO("[debug] login <Miner id=%" PRId64 ", ip=%s>, <Request login=%s, agent=%s>", e->miner()->id(), e->miner()->ip(), e->miner()->user(), e->miner()->agent());
LOG_INFO("[debug] login <Miner id=%" PRId64 ", ip=%s>, <Request login=%s, agent=%s>", e->miner()->id(), e->miner()->ip(), e->miner()->user().data(), e->miner()->agent().data());
}
break;
@@ -117,7 +117,7 @@ void xmrig::ProxyDebug::onRejectedEvent(IEvent *event)
case IEvent::LoginType: {
auto e = static_cast<LoginEvent*>(event);
LOG_ERR("[error] login <Miner id=%" PRId64 ", ip=%s>, <Request login=%s, agent=%s>", e->miner()->id(), e->miner()->ip(), e->miner()->user(), e->miner()->agent());
LOG_ERR("[error] login <Miner id=%" PRId64 ", ip=%s>, <Request login=%s, agent=%s>", e->miner()->id(), e->miner()->ip(), e->miner()->user().data(), e->miner()->agent().data());
}
break;

4
src/version.h
View File

@@ -28,7 +28,7 @@
#define APP_ID "xmrig-proxy"
#define APP_NAME "xmrig-proxy"
#define APP_DESC "XMRig Stratum proxy"
#define APP_VERSION "2.14.0"
#define APP_VERSION "2.14.2-dev"
#define APP_DOMAIN "xmrig.com"
#define APP_SITE "www.xmrig.com"
#define APP_COPYRIGHT "Copyright (C) 2016-2019 xmrig.com"
@@ -36,7 +36,7 @@
#define APP_VER_MAJOR 2
#define APP_VER_MINOR 14
#define APP_VER_PATCH 0
#define APP_VER_PATCH 2
#ifdef _MSC_VER
# if (_MSC_VER >= 1910)