@@ -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- LogPrint (BCLog::NET, " Warning: getsockname failed\n " );
433+ LogPrintLevel (BCLog::Level::Warning, BCLog::NET, " getsockname failed\n " );
434434 }
435435 }
436436 return addr_bind;
@@ -454,9 +454,9 @@ CNode* CConnman::ConnectNode(CAddress addrConnect, const char *pszDest, bool fCo
454454 }
455455
456456 // / debug print
457- LogPrint ( BCLog::NET, " trying connection %s lastseen=%.1fhrs\n " ,
458- pszDest ? pszDest : addrConnect.ToString (),
459- pszDest ? 0.0 : (double )(GetAdjustedTime () - addrConnect.nTime )/ 3600.0 );
457+ LogPrintLevel (BCLog::Level::Debug, BCLog::NET, " trying connection %s lastseen=%.1fhrs\n " ,
458+ pszDest ? pszDest : addrConnect.ToString (),
459+ pszDest ? 0.0 : (double )(GetAdjustedTime () - addrConnect.nTime ) / 3600.0 );
460460
461461 // Resolve
462462 const uint16_t default_port{pszDest != nullptr ? Params ().GetDefaultPort (pszDest) :
@@ -1140,7 +1140,7 @@ void CConnman::AcceptConnection(const ListenSocket& hListenSocket) {
11401140 }
11411141
11421142 if (!addr.SetSockAddr ((const struct sockaddr *)&sockaddr)) {
1143- LogPrintf ( " Warning: Unknown socket family\n " );
1143+ LogPrintLevel (BCLog::Level:: Warning, BCLog::NET, " Unknown socket family\n " );
11441144 } else {
11451145 addr = CAddress{MaybeFlipIPv6toCJDNS (addr), NODE_NONE};
11461146 }
@@ -2391,15 +2391,15 @@ bool CConnman::BindListenPort(const CService& addrBind, bilingual_str& strError,
23912391 socklen_t len = sizeof (sockaddr);
23922392 if (!addrBind.GetSockAddr ((struct sockaddr *)&sockaddr, &len))
23932393 {
2394- strError = strprintf (Untranslated (" Error: Bind address family for %s not supported" ), addrBind.ToString ());
2395- LogPrintf ( " %s\n " , strError.original );
2394+ strError = strprintf (Untranslated (" Bind address family for %s not supported" ), addrBind.ToString ());
2395+ LogPrintLevel (BCLog::Level::Error, BCLog::NET, " %s\n " , strError.original );
23962396 return false ;
23972397 }
23982398
23992399 std::unique_ptr<Sock> sock = CreateSock (addrBind);
24002400 if (!sock) {
2401- strError = strprintf (Untranslated (" Error: Couldn't open socket for incoming connections (socket returned error %s)" ), NetworkErrorString (WSAGetLastError ()));
2402- LogPrintf ( " %s\n " , strError.original );
2401+ strError = strprintf (Untranslated (" Couldn't open socket for incoming connections (socket returned error %s)" ), NetworkErrorString (WSAGetLastError ()));
2402+ LogPrintLevel (BCLog::Level::Error, BCLog::NET, " %s\n " , strError.original );
24032403 return false ;
24042404 }
24052405
@@ -2435,16 +2435,16 @@ bool CConnman::BindListenPort(const CService& addrBind, bilingual_str& strError,
24352435 strError = strprintf (_ (" Unable to bind to %s on this computer. %s is probably already running." ), addrBind.ToString (), PACKAGE_NAME);
24362436 else
24372437 strError = strprintf (_ (" Unable to bind to %s on this computer (bind returned error %s)" ), addrBind.ToString (), NetworkErrorString (nErr));
2438- LogPrintf ( " %s\n " , strError.original );
2438+ LogPrintLevel (BCLog::Level::Error, BCLog::NET, " %s\n " , strError.original );
24392439 return false ;
24402440 }
24412441 LogPrintf (" Bound to %s\n " , addrBind.ToString ());
24422442
24432443 // Listen for incoming connections
24442444 if (listen (sock->Get (), SOMAXCONN) == SOCKET_ERROR)
24452445 {
2446- strError = strprintf (_ (" Error: Listening for incoming connections failed (listen returned error %s)" ), NetworkErrorString (WSAGetLastError ()));
2447- LogPrintf ( " %s\n " , strError.original );
2446+ strError = strprintf (_ (" Listening for incoming connections failed (listen returned error %s)" ), NetworkErrorString (WSAGetLastError ()));
2447+ LogPrintLevel (BCLog::Level::Error, BCLog::NET, " %s\n " , strError.original );
24482448 return false ;
24492449 }
24502450
0 commit comments