diff options
| author | 2025-03-22 14:29:12 +0000 | |
|---|---|---|
| committer | 2025-03-22 14:37:15 +0000 | |
| commit | 30d0f2827215f635f4cdefed8300c1c085ae953c (patch) | |
| tree | 7fc4837accfb8d7bed95449eeb816e84bfa87ea6 /modules/spanningtree/treesocket2.cpp | |
| parent | Allow reloading the geolocation database with a module rehash. (diff) | |
| parent | Allow using the long duration format in the xline message. (diff) | |
Merge branch 'insp4' into master.
Diffstat (limited to 'modules/spanningtree/treesocket2.cpp')
| -rw-r--r-- | modules/spanningtree/treesocket2.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/modules/spanningtree/treesocket2.cpp b/modules/spanningtree/treesocket2.cpp index bd667f0c8..d8c0e9544 100644 --- a/modules/spanningtree/treesocket2.cpp +++ b/modules/spanningtree/treesocket2.cpp @@ -164,13 +164,13 @@ void TreeSocket::ProcessLine(std::string& line) time_t delta = std::abs(them - ServerInstance->Time()); if (delta > 15) { - ServerInstance->SNO.WriteGlobalSno('l', "\002ERROR\002: Your clocks are off by {} (this is more than fifteen seconds). Link aborted, \002PLEASE SYNC YOUR CLOCKS!\002", Duration::ToHuman(delta)); - SendError(FMT::format("Your clocks are out by {} (this is more than fifteen seconds). Link aborted, PLEASE SYNC YOUR CLOCKS!", Duration::ToHuman(delta))); + ServerInstance->SNO.WriteGlobalSno('l', "\002ERROR\002: Your clocks are off by {} (this is more than fifteen seconds). Link aborted, \002PLEASE SYNC YOUR CLOCKS!\002", Duration::ToLongString(delta)); + SendError(FMT::format("Your clocks are out by {} (this is more than fifteen seconds). Link aborted, PLEASE SYNC YOUR CLOCKS!", Duration::ToLongString(delta))); return; } else if (delta > 5) { - ServerInstance->SNO.WriteGlobalSno('l', "\002WARNING\002: Your clocks are off by {}. Please consider syncing your clocks.", Duration::ToHuman(delta)); + ServerInstance->SNO.WriteGlobalSno('l', "\002WARNING\002: Your clocks are off by {}. Please consider syncing your clocks.", Duration::ToLongString(delta)); } } @@ -436,7 +436,7 @@ void TreeSocket::Close() time_t server_uptime = ServerInstance->Time() - this->age; if (server_uptime) { - std::string timestr = Duration::ToHuman(server_uptime); + std::string timestr = Duration::ToLongString(server_uptime); ServerInstance->SNO.WriteGlobalSno('l', "Connection to '\002{}\002' was established for {}", linkID, timestr); } } |
