summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert Griebl <robert.griebl@pelagicore.com>2019-01-17 16:38:02 +0100
committerRobert Griebl <robert.griebl@pelagicore.com>2019-01-17 19:58:25 +0000
commit820db21f6ba19a43383b95d9ed7dde7aff955e3e (patch)
treea9615505714ecd9cd24a65a579051344a8b75620
parentae4600abc21abb2dc4f19e1f76feeb1c3f77cfe5 (diff)
Tone down ProcessTitle error output
In case setTitle() fails, we just output a qWarning. If title() fails, we just ignore it and return what we have (which is either a nullptr or the original argv[0]). Change-Id: Ia4bbee8eb06e700cda07b543924a14d9b5ceacc3 Reviewed-by: Dominik Holland <dominik.holland@pelagicore.com>
-rw-r--r--src/common-lib/processtitle.cpp7
1 files changed, 2 insertions, 5 deletions
diff --git a/src/common-lib/processtitle.cpp b/src/common-lib/processtitle.cpp
index d7e04a51..c65cdb8f 100644
--- a/src/common-lib/processtitle.cpp
+++ b/src/common-lib/processtitle.cpp
@@ -149,7 +149,8 @@ decltype(ProcessTitleInitialize) *init_ProcessTitleInitialize
void ProcessTitle::setTitle(const char *fmt, ...)
{
if (!startOfArgv || maxArgvSize <= 0 || !originalArgv || originalArgvSize <= 0) {
- qCritical(LogSystem) << "ERROR: called ProcessTitle::setTitle(), but the initialization function was not called via .init_array beforehand.";
+ qWarning(LogSystem) << "ProcessTitle::setTitle() failed, because its initialization function"
+ " was not called via an .init_array section at process startup.";
return;
}
@@ -191,10 +192,6 @@ void ProcessTitle::setTitle(const char *fmt, ...)
const char *ProcessTitle::title()
{
- if (!startOfArgv || maxArgvSize <= 0 || !originalArgv || originalArgvSize <= 0) {
- qCritical(LogSystem) << "ERROR: called ProcessTitle::title(), but the initialization function was not called via .init_array beforehand.";
- return nullptr;
- }
return startOfArgv;
}