Skip to content

Commit c4e7717

Browse files
laanwjlaanwj
committed
refactor: Change LogPrintLevel order to category, severity
This is more consistent with the other functions, as well as with the logging output itself. If we want to make this change, we should do it before it's all over the place.
1 parent ce92071 commit c4e7717

File tree

5 files changed

+14
-14
lines changed

5 files changed

+14
-14
lines changed

‎src/dbwrapper.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ class CBitcoinLevelDBLogger : public leveldb::Logger {
6363

6464
assert(p <= limit);
6565
base[std::min(bufsize - 1, (int)(p - base))] = '\0';
66-
LogPrintLevel(BCLog::Level::Debug, BCLog::LEVELDB, "%s", base); /* Continued */
66+
LogPrintLevel(BCLog::LEVELDB, BCLog::Level::Debug, "%s", base); /* Continued */
6767
if (base != buffer) {
6868
delete[] base;
6969
}

‎src/httpserver.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -359,7 +359,7 @@ static void libevent_log_cb(int severity, const char *msg)
359359
level = BCLog::Level::Error;
360360
break;
361361
}
362-
LogPrintLevel(level, BCLog::LIBEVENT, "%s\n", msg);
362+
LogPrintLevel(BCLog::LIBEVENT, level, "%s\n", msg);
363363
}
364364

365365
bool InitHTTPServer()

‎src/logging.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@ static inline void LogPrintf_(const std::string& logging_function, const std::st
213213
} \
214214
} while (0)
215215

216-
#define LogPrintLevel(level, category, ...) \
216+
#define LogPrintLevel(category, level, ...) \
217217
do { \
218218
if (LogAcceptCategory((category), (level))) { \
219219
LogPrintLevel_(category, level, __VA_ARGS__); \

‎src/net.cpp‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -430,7 +430,7 @@ static CAddress GetBindAddress(SOCKET sock)
430430
if (!getsockname(sock, (struct sockaddr*)&sockaddr_bind, &sockaddr_bind_len)) {
431431
addr_bind.SetSockAddr((const struct sockaddr*)&sockaddr_bind);
432432
} else {
433-
LogPrintLevel(BCLog::Level::Warning, BCLog::NET, "getsockname failed\n");
433+
LogPrintLevel(BCLog::NET, BCLog::Level::Warning, "getsockname failed\n");
434434
}
435435
}
436436
return addr_bind;
@@ -454,7 +454,7 @@ CNode* CConnman::ConnectNode(CAddress addrConnect, const char *pszDest, bool fCo
454454
}
455455

456456
/// debug print
457-
LogPrintLevel(BCLog::Level::Debug, BCLog::NET, "trying connection %s lastseen=%.1fhrs\n",
457+
LogPrintLevel(BCLog::NET, BCLog::Level::Debug, "trying connection %s lastseen=%.1fhrs\n",
458458
pszDest ? pszDest : addrConnect.ToString(),
459459
pszDest ? 0.0 : (double)(GetAdjustedTime() - addrConnect.nTime) / 3600.0);
460460

@@ -1140,7 +1140,7 @@ void CConnman::AcceptConnection(const ListenSocket& hListenSocket) {
11401140
}
11411141

11421142
if (!addr.SetSockAddr((const struct sockaddr*)&sockaddr)) {
1143-
LogPrintLevel(BCLog::Level::Warning, BCLog::NET, "Unknown socket family\n");
1143+
LogPrintLevel(BCLog::NET, BCLog::Level::Warning, "Unknown socket family\n");
11441144
} else {
11451145
addr = CAddress{MaybeFlipIPv6toCJDNS(addr), NODE_NONE};
11461146
}
@@ -2398,14 +2398,14 @@ bool CConnman::BindListenPort(const CService& addrBind, bilingual_str& strError,
23982398
if (!addrBind.GetSockAddr((struct sockaddr*)&sockaddr, &len))
23992399
{
24002400
strError = strprintf(Untranslated("Bind address family for %s not supported"), addrBind.ToString());
2401-
LogPrintLevel(BCLog::Level::Error, BCLog::NET, "%s\n", strError.original);
2401+
LogPrintLevel(BCLog::NET, BCLog::Level::Error, "%s\n", strError.original);
24022402
return false;
24032403
}
24042404

24052405
std::unique_ptr<Sock> sock = CreateSock(addrBind);
24062406
if (!sock) {
24072407
strError = strprintf(Untranslated("Couldn't open socket for incoming connections (socket returned error %s)"), NetworkErrorString(WSAGetLastError()));
2408-
LogPrintLevel(BCLog::Level::Error, BCLog::NET, "%s\n", strError.original);
2408+
LogPrintLevel(BCLog::NET, BCLog::Level::Error, "%s\n", strError.original);
24092409
return false;
24102410
}
24112411

@@ -2441,7 +2441,7 @@ bool CConnman::BindListenPort(const CService& addrBind, bilingual_str& strError,
24412441
strError = strprintf(_("Unable to bind to %s on this computer. %s is probably already running."), addrBind.ToString(), PACKAGE_NAME);
24422442
else
24432443
strError = strprintf(_("Unable to bind to %s on this computer (bind returned error %s)"), addrBind.ToString(), NetworkErrorString(nErr));
2444-
LogPrintLevel(BCLog::Level::Error, BCLog::NET, "%s\n", strError.original);
2444+
LogPrintLevel(BCLog::NET, BCLog::Level::Error, "%s\n", strError.original);
24452445
return false;
24462446
}
24472447
LogPrintf("Bound to %s\n", addrBind.ToString());
@@ -2450,7 +2450,7 @@ bool CConnman::BindListenPort(const CService& addrBind, bilingual_str& strError,
24502450
if (listen(sock->Get(), SOMAXCONN) == SOCKET_ERROR)
24512451
{
24522452
strError = strprintf(_("Listening for incoming connections failed (listen returned error %s)"), NetworkErrorString(WSAGetLastError()));
2453-
LogPrintLevel(BCLog::Level::Error, BCLog::NET, "%s\n", strError.original);
2453+
LogPrintLevel(BCLog::NET, BCLog::Level::Error, "%s\n", strError.original);
24542454
return false;
24552455
}
24562456

‎src/test/logging_tests.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -99,10 +99,10 @@ BOOST_FIXTURE_TEST_CASE(logging_LogPrintMacros, LogSetup)
9999

100100
LogPrintf("foo5: %s\n", "bar5");
101101
LogPrint(BCLog::NET, "foo6: %s\n", "bar6");
102-
LogPrintLevel(BCLog::Level::Debug, BCLog::NET, "foo7: %s\n", "bar7");
103-
LogPrintLevel(BCLog::Level::Info, BCLog::NET, "foo8: %s\n", "bar8");
104-
LogPrintLevel(BCLog::Level::Warning, BCLog::NET, "foo9: %s\n", "bar9");
105-
LogPrintLevel(BCLog::Level::Error, BCLog::NET, "foo10: %s\n", "bar10");
102+
LogPrintLevel(BCLog::NET, BCLog::Level::Debug, "foo7: %s\n", "bar7");
103+
LogPrintLevel(BCLog::NET, BCLog::Level::Info, "foo8: %s\n", "bar8");
104+
LogPrintLevel(BCLog::NET, BCLog::Level::Warning, "foo9: %s\n", "bar9");
105+
LogPrintLevel(BCLog::NET, BCLog::Level::Error, "foo10: %s\n", "bar10");
106106
std::ifstream file{tmp_log_path};
107107
std::vector<std::string> log_lines;
108108
for (std::string log; std::getline(file, log);) {

0 commit comments

Comments
 (0)