mirrors/sddm
0
0
Fork 0
mirror of https://github.com/sddm/sddm.git synced 2024-11-23 18:13:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

Minor message handler refactoring

Browse Source
This commit is contained in:
Fabian Vogt 2023-02-04 18:18:13 +01:00
parent a31059e5e8
commit 1198395c9f
1 changed files with 5 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/common/MessageHandler.h
View File

@ -114,36 +114,27 @@ namespace SDDM {
file.write(logMessage.toLocal8Bit());
file.flush();
} else {
fprintf(stderr, "%s", qPrintable(logMessage));
fputs(qPrintable(logMessage), stderr);
fflush(stderr);
}
}
static void messageHandler(QtMsgType type, const QMessageLogContext &context, const QString &prefix, const QString &msg) {
// copy message to edit it
QString logMessage = msg;
#ifdef HAVE_JOURNALD
// don't log to journald if running interactively, this is likely
// the case when running sddm in test mode
static bool isInteractive = isatty(STDERR_FILENO) && qgetenv("USER") != "sddm";
if (!isInteractive) {
// log to journald
journaldLogger(type, context, logMessage);
} else {
// prepend program name
logMessage = prefix + msg;
// log to file or stderr
standardLogger(type, logMessage);
journaldLogger(type, context, msg);
return;
}
#else
#endif
// prepend program name
logMessage = prefix + msg;
QString logMessage = prefix + msg;
// log to file or stderr
standardLogger(type, logMessage);
#endif
}
void DaemonMessageHandler(QtMsgType type, const QMessageLogContext &context, const QString &msg) {