smw/deskflow
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

chore: ClientApp remove unused restartRetryTimer and nextRetryTimer, use RETRY_TIME directly in ClientApp instead

Browse source
This commit is contained in:
sithlord48 2025-05-21 21:01:36 -04:00 committed by Nick Bolton
parent 723671c2e5
commit 17f12d8334
2 changed files with 3 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
src/lib/deskflow/ClientApp.cpp
View file

@ -210,33 +210,6 @@ void ClientApp::updateStatus(const std::string &msg) const
// do nothing // do nothing
} }
void ClientApp::resetRestartTimeout() const
{
// retry time can nolonger be changed
// s_retryTime = 0.0;
}
double ClientApp::nextRestartTimeout() const
{
// retry at a constant rate (Issue 52)
return RETRY_TIME;
/*
// choose next restart timeout. we start with rapid retries
// then slow down.
if (s_retryTime < 1.0) {
s_retryTime = 1.0;
}
else if (s_retryTime < 3.0) {
s_retryTime = 3.0;
}
else {
s_retryTime = 5.0;
}
return s_retryTime;
*/
}
void ClientApp::handleScreenError(const Event &, void *) void ClientApp::handleScreenError(const Event &, void *)
{ {
LOG((CLOG_CRIT "error on screen")); LOG((CLOG_CRIT "error on screen"));
@ -285,7 +258,6 @@ void ClientApp::scheduleClientRestart(double retryTime)
void ClientApp::handleClientConnected(const Event &, void *) void ClientApp::handleClientConnected(const Event &, void *)
{ {
LOG((CLOG_NOTE "connected to server")); LOG((CLOG_NOTE "connected to server"));
resetRestartTimeout();
updateStatus(); updateStatus();
} }
@ -297,7 +269,7 @@ void ClientApp::handleClientFailed(const Event &e, void *)
updateStatus(std::string("Failed to connect to server: ") + info->m_what + " Trying next address..."); updateStatus(std::string("Failed to connect to server: ") + info->m_what + " Trying next address...");
LOG((CLOG_WARN "failed to connect to server=%s, trying next address", info->m_what.c_str())); LOG((CLOG_WARN "failed to connect to server=%s, trying next address", info->m_what.c_str()));
if (!m_suspended) { if (!m_suspended) {
scheduleClientRestart(nextRestartTimeout()); scheduleClientRestart(RETRY_TIME);
} }
} else { } else {
m_lastServerAddressIndex = 0; m_lastServerAddressIndex = 0;
@ -316,7 +288,7 @@ void ClientApp::handleClientRefused(const Event &e, void *)
} else { } else {
LOG((CLOG_WARN "failed to connect to server: %s", info->m_what.c_str())); LOG((CLOG_WARN "failed to connect to server: %s", info->m_what.c_str()));
if (!m_suspended) { if (!m_suspended) {
scheduleClientRestart(nextRestartTimeout()); scheduleClientRestart(RETRY_TIME);
} }
} }
} }
@ -327,7 +299,7 @@ void ClientApp::handleClientDisconnected(const Event &, void *)
if (!args().m_restartable) { if (!args().m_restartable) {
m_events->addEvent(Event(EventTypes::Quit)); m_events->addEvent(Event(EventTypes::Quit));
} else if (!m_suspended) { } else if (!m_suspended) {
scheduleClientRestart(nextRestartTimeout()); scheduleClientRestart(RETRY_TIME);
} }
updateStatus(); updateStatus();
} }

2
src/lib/deskflow/ClientApp.h
View file

@ -64,8 +64,6 @@ public:
void updateStatus(); void updateStatus();
void updateStatus(const std::string &msg) const; void updateStatus(const std::string &msg) const;
void resetRestartTimeout() const;
double nextRestartTimeout() const;
void handleScreenError(const Event &, void *); void handleScreenError(const Event &, void *);
deskflow::Screen *openClientScreen(); deskflow::Screen *openClientScreen();
void closeClientScreen(deskflow::Screen *screen); void closeClientScreen(deskflow::Screen *screen);