diff options
| author | ShadowNinja <shadowninja@minetest.net> | 2015-10-14 01:26:03 -0400 |
|---|---|---|
| committer | kwolekr <kwolekr@minetest.net> | 2015-10-14 01:36:48 -0400 |
| commit | 96cc5b34fe0151d2a1498eaaafb205757db346c4 (patch) | |
| tree | e612a2d78086427cc5f555b82c597dcf9dd13b74 /src/network | |
| parent | 2139d7d45fb1a8ed250ad96c9975c581f02f72a9 (diff) | |
| download | minetest-96cc5b34fe0151d2a1498eaaafb205757db346c4.tar.gz minetest-96cc5b34fe0151d2a1498eaaafb205757db346c4.tar.bz2 minetest-96cc5b34fe0151d2a1498eaaafb205757db346c4.zip | |
Use warningstream for log messages with WARNING
Remove DTIME macro and its uses, too
Diffstat (limited to 'src/network')
| -rw-r--r-- | src/network/clientpackethandler.cpp | 6 | ||||
| -rw-r--r-- | src/network/connection.cpp | 1 | ||||
| -rw-r--r-- | src/network/serverpackethandler.cpp | 2 |
3 files changed, 5 insertions, 4 deletions
diff --git a/src/network/clientpackethandler.cpp b/src/network/clientpackethandler.cpp index d49c96029..a49bbe167 100644 --- a/src/network/clientpackethandler.cpp +++ b/src/network/clientpackethandler.cpp @@ -579,7 +579,7 @@ void Client::handleCommand_MovePlayer(NetworkPacket* pkt) void Client::handleCommand_PlayerItem(NetworkPacket* pkt) { - infostream << "Client: WARNING: Ignoring TOCLIENT_PLAYERITEM" << std::endl; + warningstream << "Client: Ignoring TOCLIENT_PLAYERITEM" << std::endl; } void Client::handleCommand_DeathScreen(NetworkPacket* pkt) @@ -711,7 +711,7 @@ void Client::handleCommand_Media(NetworkPacket* pkt) void Client::handleCommand_ToolDef(NetworkPacket* pkt) { - infostream << "Client: WARNING: Ignoring TOCLIENT_TOOLDEF" << std::endl; + warningstream << "Client: Ignoring TOCLIENT_TOOLDEF" << std::endl; } void Client::handleCommand_NodeDef(NetworkPacket* pkt) @@ -738,7 +738,7 @@ void Client::handleCommand_NodeDef(NetworkPacket* pkt) void Client::handleCommand_CraftItemDef(NetworkPacket* pkt) { - infostream << "Client: WARNING: Ignoring TOCLIENT_CRAFTITEMDEF" << std::endl; + warningstream << "Client: Ignoring TOCLIENT_CRAFTITEMDEF" << std::endl; } void Client::handleCommand_ItemDef(NetworkPacket* pkt) diff --git a/src/network/connection.cpp b/src/network/connection.cpp index d73d4ba17..0738c6a1f 100644 --- a/src/network/connection.cpp +++ b/src/network/connection.cpp @@ -2099,6 +2099,7 @@ void * ConnectionReceiveThread::run() #endif END_DEBUG_EXCEPTION_HANDLER(errorstream); } + PROFILE(g_profiler->remove(ThreadIdentifier.str())); return NULL; } diff --git a/src/network/serverpackethandler.cpp b/src/network/serverpackethandler.cpp index 0bf7e4769..d9ff564da 100644 --- a/src/network/serverpackethandler.cpp +++ b/src/network/serverpackethandler.cpp @@ -1713,7 +1713,7 @@ void Server::handleCommand_Interact(NetworkPacket* pkt) Catch invalid actions */ else { - infostream << "WARNING: Server: Invalid action " + warningstream << "Server: Invalid action " << action << std::endl; } } |