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

Change core start errors to fatal (#7277)

Browse source 
* Change core start error to FATAL

* Update ChangeLog

---------

Co-authored-by: Serhii Hadzhilov <serhii-external@symless.com>
This commit is contained in:
Serhii Hadzhilov 2023-08-16 12:20:24 +04:00 committed by GitHub
parent 2ac3f7f5a3
commit 1a810ccdd7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
ChangeLog
View file

@ -10,6 +10,7 @@ Enhancements:
- #7263 Change name of Flatpak uploaded to snapshots
- #7269 Reword file drag drop error to debug message
- #7274 Only build necessary binaries
- #7277 Change start errors to fatal
1.14.6
======

6
src/lib/platform/MSWindowsWatchdog.cpp
View file

@ -287,13 +287,13 @@ MSWindowsWatchdog::mainLoop(void*)
}
catch (std::exception& e) {
LOG((CLOG_ERR "failed to launch, error: %s", e.what()));
LOG((CLOG_CRIT "failed to launch, error: %s", e.what()));
m_processFailures++;
m_processRunning = false;
continue;
}
catch (...) {
LOG((CLOG_ERR "failed to launch, unknown error."));
LOG((CLOG_CRIT "failed to launch, unknown error."));
m_processFailures++;
m_processRunning = false;
continue;
@ -370,7 +370,7 @@ MSWindowsWatchdog::startProcess()
}
if (!createRet) {
LOG((CLOG_ERR "could not launch command"));
LOG((CLOG_CRIT "could not launch command"));
DWORD exitCode = 0;
GetExitCodeProcess(m_processInfo.hProcess, &exitCode);
LOG((CLOG_ERR "exit code: %d", exitCode));

2
src/lib/synergy/App.cpp
View file

@ -203,7 +203,7 @@ App::initApp(int argc, const char** argv)
// set log filter
if (!CLOG->setFilter(argsBase().m_logFilter)) {
LOG((CLOG_PRINT "%s: unrecognized log level `%s'" BYE,
LOG((CLOG_CRIT "%s: unrecognized log level `%s'" BYE,
argsBase().m_pname, argsBase().m_logFilter, argsBase().m_pname));
m_bye(kExitArgs);
}

6
src/lib/synergy/ArgParser.cpp
View file

@ -68,7 +68,7 @@ ArgParser::parseServerArgs(lib::synergy::ServerArgs& args, int argc, const char*
continue;
}
else {
LOG((CLOG_PRINT "%s: unrecognized option `%s'" BYE, args.m_pname, argv[i], args.m_pname));
LOG((CLOG_CRIT "%s: unrecognized option `%s'" BYE, args.m_pname, argv[i], args.m_pname));
return false;
}
++i;
@ -130,7 +130,7 @@ ArgParser::parseClientArgs(lib::synergy::ClientArgs& args, int argc, const char*
return true;
}
LOG((CLOG_PRINT "%s: unrecognized option `%s'" BYE, args.m_pname, argv[i], args.m_pname));
LOG((CLOG_CRIT "%s: unrecognized option `%s'" BYE, args.m_pname, argv[i], args.m_pname));
return false;
}
++i;
@ -138,7 +138,7 @@ ArgParser::parseClientArgs(lib::synergy::ClientArgs& args, int argc, const char*
// exactly one non-option argument (server-address)
if (i == argc) {
LOG((CLOG_PRINT "%s: a server address or name is required" BYE,
LOG((CLOG_CRIT "%s: a server address or name is required" BYE,
args.m_pname, args.m_pname));
return false;
}

2
src/lib/synergy/ClientApp.cpp
View file

@ -98,7 +98,7 @@ ClientApp::parseArgs(int argc, const char* const* argv)
// server. a bad port will never get better. patch by Brent
// Priddy.
if (!args().m_restartable || e.getError() == XSocketAddress::kBadPort) {
LOG((CLOG_PRINT "%s: %s" BYE,
LOG((CLOG_CRIT "%s: %s" BYE,
args().m_pname, e.what(), args().m_pname));
m_bye(kExitFailed);
}

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

@ -99,7 +99,7 @@ ServerApp::parseArgs(int argc, const char* const* argv)
m_synergyAddress->resolve();
}
catch (XSocketAddress& e) {
LOG((CLOG_PRINT "%s: %s" BYE,
LOG((CLOG_CRIT "%s: %s" BYE,
args().m_pname, e.what(), args().m_pname));
m_bye(kExitArgs);
}
@ -219,7 +219,7 @@ ServerApp::loadConfig()
}
if (!loaded) {
LOG((CLOG_PRINT "%s: no configuration available", args().m_pname));
LOG((CLOG_CRIT "%s: no configuration available", args().m_pname));
m_bye(kExitConfig);
}
}