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

Change warning to fatal error (#7278)

Browse source 
Co-authored-by: Serhii Hadzhilov <serhii-external@symless.com>
This commit is contained in:
Serhii Hadzhilov 2023-08-16 19:46:27 +04:00 committed by GitHub
parent 1a810ccdd7
commit 944abfaa1a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/lib/synergy/ServerApp.cpp
View file

@ -540,7 +540,6 @@ ServerApp::startServer()
assert(m_serverState == kInitialized); assert(m_serverState == kInitialized);
} }
double retryTime {};
ClientListener* listener = NULL; ClientListener* listener = NULL;
try { try {
listener = openClientListener(args().m_config->getSynergyAddress()); listener = openClientListener(args().m_config->getSynergyAddress());
@ -554,10 +553,9 @@ ServerApp::startServer()
return true; return true;
} }
catch (XSocketAddressInUse& e) { catch (XSocketAddressInUse& e) {
LOG((CLOG_WARN "cannot listen for clients: %s", e.what())); LOG((CLOG_CRIT "cannot listen for clients: %s", e.what()));
closeClientListener(listener); closeClientListener(listener);
updateStatus(String("cannot listen for clients: ") + e.what()); updateStatus(String("cannot listen for clients: ") + e.what());
retryTime = 10.0;
} }
catch (XBase& e) { catch (XBase& e) {
LOG((CLOG_CRIT "failed to start server: %s", e.what())); LOG((CLOG_CRIT "failed to start server: %s", e.what()));
@ -568,6 +566,7 @@ ServerApp::startServer()
if (args().m_restartable) { if (args().m_restartable) {
// install a timer and handler to retry later // install a timer and handler to retry later
assert(m_timer == NULL); assert(m_timer == NULL);
const auto retryTime = 10.0;
LOG((CLOG_DEBUG "retry in %.0f seconds", retryTime)); LOG((CLOG_DEBUG "retry in %.0f seconds", retryTime));
m_timer = m_events->newOneShotTimer(retryTime, NULL); m_timer = m_events->newOneShotTimer(retryTime, NULL);
m_events->adoptHandler(Event::kTimer, m_timer, m_events->adoptHandler(Event::kTimer, m_timer,