Mercurial > irccd
changeset 245:520bf779bf28
Irccd: use shorter variables names
author | David Demelier <markand@malikania.fr> |
---|---|
date | Wed, 17 Aug 2016 18:35:31 +0200 |
parents | f71fa7d19ceb |
children | 62807bf9a68c |
files | lib/irccd/server-state-connected.cpp lib/irccd/server-state-connecting.cpp lib/irccd/server-state-disconnected.cpp lib/irccd/server.hpp |
diffstat | 4 files changed, 18 insertions(+), 18 deletions(-) [+] |
line wrap: on
line diff
--- a/lib/irccd/server-state-connected.cpp Wed Aug 17 18:24:56 2016 +0200 +++ b/lib/irccd/server-state-connected.cpp Wed Aug 17 18:35:31 2016 +0200 @@ -32,11 +32,11 @@ if (!irc_is_connected(*server.m_session)) { log::warning() << "server " << server.m_name << ": disconnected" << std::endl; - if (server.m_reconnectDelay > 0) - log::warning("server {}: retrying in {} seconds"_format(server.m_name, server.m_reconnectDelay)); + if (server.m_recodelay > 0) + log::warning("server {}: retrying in {} seconds"_format(server.m_name, server.m_recodelay)); server.next(std::make_unique<DisconnectedState>()); - } else if (server.m_timer.elapsed() >= server.m_pingTimeout * 1000) { + } else if (server.m_timer.elapsed() >= server.m_timeout * 1000) { log::warning() << "server " << server.m_name << ": ping timeout after " << (server.m_timer.elapsed() / 1000) << " seconds" << std::endl; server.next(std::make_unique<DisconnectedState>());
--- a/lib/irccd/server-state-connecting.cpp Wed Aug 17 18:24:56 2016 +0200 +++ b/lib/irccd/server-state-connecting.cpp Wed Aug 17 18:35:31 2016 +0200 @@ -79,15 +79,15 @@ * Otherwise, the libircclient event_connect will change the state. */ if (m_started) { - if (m_timer.elapsed() > static_cast<unsigned>(server.m_reconnectDelay * 1000)) { + if (m_timer.elapsed() > static_cast<unsigned>(server.m_recodelay * 1000)) { log::warning() << "server " << server.name() << ": timeout while connecting" << std::endl; server.next(std::make_unique<DisconnectedState>()); } else if (!irc_is_connected(*server.m_session)) { log::warning() << "server " << server.m_name << ": error while connecting: "; log::warning() << irc_strerror(irc_errno(*server.m_session)) << std::endl; - if (server.m_reconnectTries != 0) - log::warning("server {}: retrying in {} seconds"_format(server.m_name, server.m_reconnectDelay)); + if (server.m_recotries != 0) + log::warning("server {}: retrying in {} seconds"_format(server.m_name, server.m_recodelay)); server.next(std::make_unique<DisconnectedState>()); } else
--- a/lib/irccd/server-state-disconnected.cpp Wed Aug 17 18:24:56 2016 +0200 +++ b/lib/irccd/server-state-disconnected.cpp Wed Aug 17 18:35:31 2016 +0200 @@ -25,14 +25,14 @@ void Server::DisconnectedState::prepare(Server &server, fd_set &, fd_set &, net::Handle &) { - if (server.m_reconnectTries == 0) { + if (server.m_recotries == 0) { log::warning() << "server " << server.m_name << ": reconnection disabled, skipping" << std::endl; server.onDie(); - } else if (server.m_reconnectTries > 0 && server.m_recocur > server.m_reconnectTries) { + } else if (server.m_recotries > 0 && server.m_recocur > server.m_recotries) { log::warning() << "server " << server.m_name << ": giving up" << std::endl; server.onDie(); } else { - if (m_timer.elapsed() > static_cast<unsigned>(server.m_reconnectDelay * 1000)) { + if (m_timer.elapsed() > static_cast<unsigned>(server.m_recodelay * 1000)) { irc_disconnect(*server.m_session); server.m_recocur ++;
--- a/lib/irccd/server.hpp Wed Aug 17 18:24:56 2016 +0200 +++ b/lib/irccd/server.hpp Wed Aug 17 18:35:31 2016 +0200 @@ -449,9 +449,9 @@ // Settings. std::string m_commandCharacter{"!"}; - std::int8_t m_reconnectTries{-1}; - std::uint16_t m_reconnectDelay{30}; - std::uint16_t m_pingTimeout{300}; + std::int8_t m_recotries{-1}; + std::uint16_t m_recodelay{30}; + std::uint16_t m_timeout{300}; // Queue of requests to send. std::queue<std::function<bool ()>> m_queue; @@ -726,7 +726,7 @@ */ inline std::int8_t reconnectTries() const noexcept { - return m_reconnectTries; + return m_recotries; } /** @@ -738,7 +738,7 @@ */ inline void setReconnectTries(std::int8_t reconnectTries) noexcept { - m_reconnectTries = reconnectTries; + m_recotries = reconnectTries; } /** @@ -748,7 +748,7 @@ */ inline std::uint16_t reconnectDelay() const noexcept { - return m_reconnectDelay; + return m_recodelay; } /** @@ -758,7 +758,7 @@ */ inline void setReconnectDelay(std::uint16_t reconnectDelay) noexcept { - m_reconnectDelay = reconnectDelay; + m_recodelay = reconnectDelay; } /** @@ -768,7 +768,7 @@ */ inline std::uint16_t pingTimeout() const noexcept { - return m_pingTimeout; + return m_timeout; } /** @@ -778,7 +778,7 @@ */ inline void setPingTimeout(std::uint16_t pingTimeout) noexcept { - m_pingTimeout = pingTimeout; + m_timeout = pingTimeout; } /**