diff --git a/src/client/client.cpp b/src/client/client.cpp index 9f0299cac..b1dfa5993 100644 --- a/src/client/client.cpp +++ b/src/client/client.cpp @@ -839,10 +839,10 @@ bool Client::loadMedia(const std::string &data, const std::string &filename, }; name = removeStringEnd(filename, model_ext); if (!name.empty()) { - verbosestream<<"Client: Storing model into memory: " - <<"\""<(argv); print_version(oss); std::string data = oss.str(); seed = murmur_hash_64_ua(data.c_str(), data.size(), 0xc0ffee); diff --git a/src/network/serverpackethandler.cpp b/src/network/serverpackethandler.cpp index e9012d351..4d92ad911 100644 --- a/src/network/serverpackethandler.cpp +++ b/src/network/serverpackethandler.cpp @@ -34,8 +34,9 @@ void Server::handleCommand_Deprecated(NetworkPacket* pkt) { - infostream << "Server: " << toServerCommandTable[pkt->getCommand()].name - << " not supported anymore" << std::endl; + auto &h = toServerCommandTable[pkt->getCommand()]; + infostream << "Server: ignoring unsupported " << h.name << " from peer " << + pkt->getPeerId() << std::endl; } void Server::handleCommand_Init(NetworkPacket* pkt) @@ -55,8 +56,8 @@ void Server::handleCommand_Init(NetworkPacket* pkt) * respond for some time, your server was overloaded or * things like that. */ - infostream << "Server::ProcessData(): Canceling: peer " << peer_id << - " not found" << std::endl; + infostream << "Server: peer " << peer_id << " not found during INIT?!" + << std::endl; return; } @@ -1363,22 +1364,11 @@ void Server::handleCommand_InventoryFields(NetworkPacket* pkt) session_t peer_id = pkt->getPeerId(); RemotePlayer *player = m_env->getPlayer(peer_id); - if (player == NULL) { - errorstream << - "Server::ProcessData(): Canceling: No player for peer_id=" << - peer_id << " disconnecting peer!" << std::endl; - DisconnectPeer(peer_id); + if (!player) return; - } - PlayerSAO *playersao = player->getPlayerSAO(); - if (playersao == NULL) { - errorstream << - "Server::ProcessData(): Canceling: No player object for peer_id=" << - peer_id << " disconnecting peer!" << std::endl; - DisconnectPeer(peer_id); + if (!playersao) return; - } std::string client_formspec_name; StringMap fields; @@ -1480,7 +1470,7 @@ void Server::handleCommand_FirstSrp(NetworkPacket* pkt) acceptAuth(peer_id, false); } else { if (cstate < CS_SudoMode) { - infostream << "Server::ProcessData(): Ignoring TOSERVER_FIRST_SRP from " + infostream << "Server: Ignoring TOSERVER_FIRST_SRP from " << addr_s << ": " << "Client has wrong state " << cstate << "." << std::endl; return; diff --git a/src/script/scripting_mainmenu.cpp b/src/script/scripting_mainmenu.cpp index 81eef7e2f..18bcf5c81 100644 --- a/src/script/scripting_mainmenu.cpp +++ b/src/script/scripting_mainmenu.cpp @@ -67,7 +67,6 @@ void MainMenuScripting::initializeModApi(lua_State *L, int top) asyncEngine.registerStateInitializer(ModApiHttp::InitializeAsync); // Initialize async environment - //TODO possibly make number of async threads configurable asyncEngine.initialize(MAINMENU_NUM_ASYNC_THREADS); } diff --git a/src/server.cpp b/src/server.cpp index 16434f447..dd73ef0e6 100644 --- a/src/server.cpp +++ b/src/server.cpp @@ -2556,6 +2556,7 @@ bool Server::addMediaFile(const std::string &filename, << filename << "\"" << std::endl; return false; } + // If name is not in a supported format, ignore it const char *supported_ext[] = { ".png", ".jpg", ".tga", @@ -2594,7 +2595,7 @@ bool Server::addMediaFile(const std::string &filename, // Put in list m_media[filename] = MediaInfo(filepath, sha1); verbosestream << "Server: " << sha1_hex << " is " << filename - << std::endl; + << " (" << (filedata.size() >> 10) << "KiB)" << std::endl; if (filedata_to) *filedata_to = std::move(filedata); @@ -2752,8 +2753,8 @@ void Server::sendRequestedMedia(session_t peer_id, auto it = m_media.find(name); if (it == m_media.end()) { - errorstream<<"Server::sendRequestedMedia(): Client asked for " - <<"unknown file \""<<(name)<<"\""<second; @@ -2762,7 +2763,7 @@ void Server::sendRequestedMedia(session_t peer_id, // have duplicate filenames. So we can't check it. if (!m.no_announce) { if (!client->markMediaSent(name)) { - infostream << "Server::sendRequestedMedia(): Client asked has " + warningstream << "Server::sendRequestedMedia(): Client has " "requested \"" << name << "\" before, not sending it again." << std::endl; continue; diff --git a/src/server/clientiface.cpp b/src/server/clientiface.cpp index bbcd4720d..b873aef00 100644 --- a/src/server/clientiface.cpp +++ b/src/server/clientiface.cpp @@ -709,8 +709,8 @@ void ClientInterface::step(float dtime) try { Address addr = m_con->GetPeerAddress(it.second->peer_id); os << "Disconnecting lingering client from " - << addr.serializeString() << " (state=" - << state2Name(state) << ")" << std::endl; + << addr.serializeString() << " peer_id=" << it.second->peer_id + << " (" << state2Name(state) << ")" << std::endl; m_con->DisconnectPeer(it.second->peer_id); } catch (con::PeerNotFoundException &e) { } @@ -739,6 +739,7 @@ void ClientInterface::UpdatePlayerList() RemoteClient* client = lockedGetClientNoEx(i); if (client) client->PrintInfo(infostream); + infostream << std::endl; } m_clients_names.emplace_back(player->getName()); diff --git a/src/server/clientiface.h b/src/server/clientiface.h index d0e91dcca..ceb700513 100644 --- a/src/server/clientiface.h +++ b/src/server/clientiface.h @@ -276,12 +276,12 @@ public: void PrintInfo(std::ostream &o) { - o<<"RemoteClient "<map_settings_mgr = &settings_mgr; @@ -576,6 +574,7 @@ MapDatabase *ServerMap::createDatabase( Settings &conf) { MapDatabase *db = nullptr; + verbosestream << "Creating map database with backend \"" << name << "\"" << std::endl; if (name == "sqlite3") db = new MapDatabaseSQLite3(savedir);