Rim/iw4x-client
Rim/iw4x-client
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

[Node]: Reduce console spam on debug (#1039)

Browse Source
This commit is contained in:
Edo 2023-05-14 17:42:42 +01:00 committed by GitHub
parent c3dfd6bd0c
commit 2e27fca19f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/Components/Modules/Node.cpp
View File

@ -15,12 +15,12 @@ namespace Components
bool Node::WasIngame = false; bool Node::WasIngame = false;
bool Node::Entry::isValid() bool Node::Entry::isValid() const
{ {
return (this->lastResponse.has_value() && !this->lastResponse->elapsed(NODE_HALFLIFE * 2)); return (this->lastResponse.has_value() && !this->lastResponse->elapsed(NODE_HALFLIFE * 2));
} }
bool Node::Entry::isDead() bool Node::Entry::isDead() const
{ {
if (!this->lastResponse.has_value()) if (!this->lastResponse.has_value())
{ {
@ -37,7 +37,7 @@ namespace Components
return false; return false;
} }
bool Node::Entry::requiresRequest() bool Node::Entry::requiresRequest() const
{ {
return (!this->isDead() && (!this->lastRequest.has_value() || this->lastRequest->elapsed(NODE_HALFLIFE))); return (!this->isDead() && (!this->lastRequest.has_value() || this->lastRequest->elapsed(NODE_HALFLIFE)));
} }
@ -49,7 +49,9 @@ namespace Components
Session::Send(this->address, "nodeListRequest"); Session::Send(this->address, "nodeListRequest");
Node::SendList(this->address); Node::SendList(this->address);
#ifdef NODE_SYSTEM_DEBUG
Logger::Debug("Sent request to {}", this->address.getString()); Logger::Debug("Sent request to {}", this->address.getString());
#endif
} }
void Node::Entry::reset() void Node::Entry::reset()
@ -217,7 +219,9 @@ namespace Components
Proto::Node::List list; Proto::Node::List list;
if (!list.ParseFromString(data)) return; if (!list.ParseFromString(data)) return;
#ifdef NODE_SYSTEM_DEBUG
Logger::Debug("Received response from {}", address.getString()); Logger::Debug("Received response from {}", address.getString());
#endif
std::lock_guard _(Node::Mutex); std::lock_guard _(Node::Mutex);
@ -235,12 +239,16 @@ namespace Components
{ {
if (!Dedicated::IsEnabled() && ServerList::IsOnlineList() && !ServerList::UseMasterServer && list.protocol() == PROTOCOL) if (!Dedicated::IsEnabled() && ServerList::IsOnlineList() && !ServerList::UseMasterServer && list.protocol() == PROTOCOL)
{ {
#ifdef NODE_SYSTEM_DEBUG
Logger::Debug("Inserting {} into the serverlist", address.getString()); Logger::Debug("Inserting {} into the serverlist", address.getString());
#endif
ServerList::InsertRequest(address); ServerList::InsertRequest(address);
} }
else else
{ {
#ifdef NODE_SYSTEM_DEBUG
Logger::Debug("Dropping serverlist insertion for {}", address.getString()); Logger::Debug("Dropping serverlist insertion for {}", address.getString());
#endif
} }
for (auto& node : Node::Nodes) for (auto& node : Node::Nodes)
@ -304,7 +312,7 @@ namespace Components
{ {
Scheduler::Once([=] Scheduler::Once([=]
{ {
#ifdef DEBUG_NODE #ifdef NODE_SYSTEM_DEBUG
Logger::Debug("Sending {} nodeListResponse length to {}\n", nodeListData.length(), address.getCString()); Logger::Debug("Sending {} nodeListResponse length to {}\n", nodeListData.length(), address.getCString());
#endif #endif
Session::Send(address, "nodeListResponse", nodeListData); Session::Send(address, "nodeListResponse", nodeListData);
@ -359,7 +367,11 @@ namespace Components
Command::Add("addnode", [](const Command::Params* params) Command::Add("addnode", [](const Command::Params* params)
{ {
if (params->size() < 2) return; if (params->size() < 2) return;
Node::Add({ params->get(1) }); auto address = Network::Address{ params->get(1) };
if (address.isValid())
{
Node::Add(address);
}
}); });
} }

6
src/Components/Modules/Node.hpp
View File

@ -24,10 +24,10 @@ namespace Components
std::optional<Utils::Time::Point> lastRequest; std::optional<Utils::Time::Point> lastRequest;
std::optional<Utils::Time::Point> lastResponse; std::optional<Utils::Time::Point> lastResponse;
bool isValid(); [[nodiscard]] bool isValid() const;
bool isDead(); [[nodiscard]] bool isDead() const;
bool requiresRequest(); [[nodiscard]] bool requiresRequest() const;
void sendRequest(); void sendRequest();
void reset(); void reset();