Cut down content transfer verbosity

diff --git a/src/client.cpp b/src/client.cpp
index 9752ec5e2d287bfd3cb2b4e00988dd947c621166..5c713e48640b9d190f60be3d88a9c48c13e6804a 100644 (file)
--- a/src/client.cpp
+++ b/src/client.cpp
@@ -1517,9 +1517,6 @@ void Client::ProcessData(u8 *data, u32 datasize, u16 sender_peer_id)
        }
        else if(command == TOCLIENT_TEXTURES)
        {
-               infostream<<"Client: Received textures: packet size: "<<datasize
-                               <<std::endl;
-
                io::IFileSystem *irrfs = m_device->getFileSystem();
                video::IVideoDriver *vdrv = m_device->getVideoDriver();
 
@@ -1547,8 +1544,9 @@ void Client::ProcessData(u8 *data, u32 datasize, u16 sender_peer_id)
                if(bunch_i == num_bunches - 1)
                        m_textures_received = true;
                int num_textures = readU32(is);
-               infostream<<"Client: Received textures: count: "<<num_textures
-                               <<std::endl;
+               infostream<<"Client: Received textures: bunch "<<bunch_i<<"/"
+                               <<num_bunches<<" textures="<<num_textures
+                               <<" size="<<datasize<<std::endl;
                for(int i=0; i<num_textures; i++){
                        std::string name = deSerializeString(is);
                        std::string data = deSerializeLongString(is);

diff --git a/src/server.cpp b/src/server.cpp
index 2a9aac32beccc5e376746fddbac28da963a37756..6a3421c0d9f6610709f445f2d7f84a161703f876 100644 (file)
--- a/src/server.cpp
+++ b/src/server.cpp
@@ -3640,7 +3640,6 @@ void Server::SendToolDef(con::Connection &con, u16 peer_id,
                IToolDefManager *tooldef)
 {
        DSTACK(__FUNCTION_NAME);
-       infostream<<"Server: Sending tool definitions"<<std::endl;
        std::ostringstream os(std::ios_base::binary);
 
        /*
@@ -3655,7 +3654,7 @@ void Server::SendToolDef(con::Connection &con, u16 peer_id,
 
        // Make data buffer
        std::string s = os.str();
-       infostream<<"Server: Sending tool definitions: data size: "
+       infostream<<"Server::SendToolDef(): Sending tool definitions: size="
                        <<s.size()<<std::endl;
        SharedBuffer<u8> data((u8*)s.c_str(), s.size());
        // Send as reliable
@@ -3666,7 +3665,6 @@ void Server::SendNodeDef(con::Connection &con, u16 peer_id,
                INodeDefManager *nodedef)
 {
        DSTACK(__FUNCTION_NAME);
-       infostream<<"Server: Sending node definitions"<<std::endl;
        std::ostringstream os(std::ios_base::binary);
 
        /*
@@ -3681,7 +3679,7 @@ void Server::SendNodeDef(con::Connection &con, u16 peer_id,
 
        // Make data buffer
        std::string s = os.str();
-       infostream<<"Server: Sending node definitions: data size: "
+       infostream<<"Server::SendNodeDef(): Sending node definitions: size="
                        <<s.size()<<std::endl;
        SharedBuffer<u8> data((u8*)s.c_str(), s.size());
        // Send as reliable
@@ -4205,8 +4203,8 @@ void Server::SendTextures(u16 peer_id)
                                                <<tname<<"\""<<std::endl;
                                continue;
                        }
-                       errorstream<<"Server::SendTextures(): Loaded \""
-                                       <<tname<<"\""<<std::endl;
+                       /*infostream<<"Server::SendTextures(): Loaded \""
+                                       <<tname<<"\""<<std::endl;*/
                        // Put in list
                        texture_bunches[texture_bunches.size()-1].push_back(
                                        SendableTexture(tname, tpath, tmp_os.str()));
@@ -4252,9 +4250,9 @@ void Server::SendTextures(u16 peer_id)
                
                // Make data buffer
                std::string s = os.str();
-               infostream<<"Server::SendTextures(): number of textures in bunch["
-                               <<i<<"]: "<<texture_bunches[i].size()
-                               <<", size: "<<s.size()<<std::endl;
+               infostream<<"Server::SendTextures(): bunch "<<i<<"/"<<num_bunches
+                               <<" textures="<<texture_bunches[i].size()
+                               <<" size=" <<s.size()<<std::endl;
                SharedBuffer<u8> data((u8*)s.c_str(), s.size());
                // Send as reliable
                m_con.Send(peer_id, 0, data, true);