diff --git a/ChangeLog b/ChangeLog index f792a17f7..cf9fc8874 100644 --- a/ChangeLog +++ b/ChangeLog @@ -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 ====== diff --git a/src/lib/platform/MSWindowsWatchdog.cpp b/src/lib/platform/MSWindowsWatchdog.cpp index 6281c2eaf..210b8dfe9 100644 --- a/src/lib/platform/MSWindowsWatchdog.cpp +++ b/src/lib/platform/MSWindowsWatchdog.cpp @@ -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)); diff --git a/src/lib/synergy/App.cpp b/src/lib/synergy/App.cpp index 1b391d99a..284e74882 100644 --- a/src/lib/synergy/App.cpp +++ b/src/lib/synergy/App.cpp @@ -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); } diff --git a/src/lib/synergy/ArgParser.cpp b/src/lib/synergy/ArgParser.cpp index d8e6abd49..b78a70cea 100644 --- a/src/lib/synergy/ArgParser.cpp +++ b/src/lib/synergy/ArgParser.cpp @@ -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; } diff --git a/src/lib/synergy/ClientApp.cpp b/src/lib/synergy/ClientApp.cpp index bdc908b4e..aa262cd5e 100644 --- a/src/lib/synergy/ClientApp.cpp +++ b/src/lib/synergy/ClientApp.cpp @@ -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); } diff --git a/src/lib/synergy/ServerApp.cpp b/src/lib/synergy/ServerApp.cpp index 51a37adcb..682928a10 100644 --- a/src/lib/synergy/ServerApp.cpp +++ b/src/lib/synergy/ServerApp.cpp @@ -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); } }