|
@@ -96,7 +96,9 @@ std::string Logger::typeToString(LoggerType type) {
|
|
|
|
|
|
|
|
std::string Logger::levelToSystemdPriority(LogLevel level) {
|
|
std::string Logger::levelToSystemdPriority(LogLevel level) {
|
|
|
// Only include priority markers when running under systemd
|
|
// Only include priority markers when running under systemd
|
|
|
- if (!isRunningUnderSystemd()) {
|
|
|
|
|
|
|
+ // Note: Don't call isRunningUnderSystemd() here to avoid deadlock
|
|
|
|
|
+ // since this method is called from within the log() method which already holds the mutex
|
|
|
|
|
+ if (!m_isRunningUnderSystemd) {
|
|
|
return "";
|
|
return "";
|
|
|
}
|
|
}
|
|
|
|
|
|