From 3e8e011c33a2126ab5da32c770c8d22d3a63d468 Mon Sep 17 00:00:00 2001 From: Daniel Lim Wee Soong Date: Tue, 27 Mar 2018 19:00:14 +0800 Subject: [PATCH] network: Migrate logging macros (#3575) * network: Migrate logging macros Follow-up of #3533 Replace prefix of all logging macros from LOG to NGLOG * Remove hash in format --- src/network/network.cpp | 6 +++--- src/network/room.cpp | 9 +++++---- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/network/network.cpp b/src/network/network.cpp index 51b5d6a9f..829675357 100644 --- a/src/network/network.cpp +++ b/src/network/network.cpp @@ -15,12 +15,12 @@ static std::shared_ptr g_room; ///< Room (Server) for network bool Init() { if (enet_initialize() != 0) { - LOG_ERROR(Network, "Error initalizing ENet"); + NGLOG_ERROR(Network, "Error initalizing ENet"); return false; } g_room = std::make_shared(); g_room_member = std::make_shared(); - LOG_DEBUG(Network, "initialized OK"); + NGLOG_DEBUG(Network, "initialized OK"); return true; } @@ -44,7 +44,7 @@ void Shutdown() { g_room.reset(); } enet_deinitialize(); - LOG_DEBUG(Network, "shutdown OK"); + NGLOG_DEBUG(Network, "shutdown OK"); } } // namespace Network diff --git a/src/network/room.cpp b/src/network/room.cpp index f1ee9299e..1a61394d9 100644 --- a/src/network/room.cpp +++ b/src/network/room.cpp @@ -408,10 +408,11 @@ void Room::RoomImpl::HandleWifiPacket(const ENetEvent* event) { if (member != members.end()) { enet_peer_send(member->peer, 0, enet_packet); } else { - LOG_ERROR(Network, - "Attempting to send to unknown MAC address: %02X:%02X:%02X:%02X:%02X:%02X", - destination_address[0], destination_address[1], destination_address[2], - destination_address[3], destination_address[4], destination_address[5]); + NGLOG_ERROR(Network, + "Attempting to send to unknown MAC address: " + "{:02X}:{:02X}:{:02X}:{:02X}:{:02X}:{:02X}", + destination_address[0], destination_address[1], destination_address[2], + destination_address[3], destination_address[4], destination_address[5]); enet_packet_destroy(enet_packet); } }