EPN Stderr monitor: Prepend messages from syslog with [GLOBAL SYSLOG]

davidrohr · davidrohr · commit 394aba9b02f6 · 2024-04-05T13:43:46.000+02:00
diff --git a/Utilities/EPNMonitoring/src/EPNstderrMonitor.cxx b/Utilities/EPNMonitoring/src/EPNstderrMonitor.cxx
@@ -126,7 +126,7 @@ void EPNMonitor::sendLog(const std::string& file, const std::string& message)
     mLoggerContext->setField(InfoLogger::InfoLoggerContext::FieldName::Facility, ("stderr/" + file).substr(0, 31));
     mLoggerContext->setField(InfoLogger::InfoLoggerContext::FieldName::Run, mRunNumber != 0 ? std::to_string(mRunNumber) : "unspecified");
     static const InfoLogger::InfoLogger::InfoLoggerMessageOption opt = {InfoLogger::InfoLogger::Severity::Error, 3, InfoLogger::InfoLogger::undefinedMessageOption.errorCode, InfoLogger::InfoLogger::undefinedMessageOption.sourceFile, InfoLogger::InfoLogger::undefinedMessageOption.sourceLine};
-    mLogger->log(opt, *mLoggerContext, "stderr: %s", message.c_str());
+    mLogger->log(opt, *mLoggerContext, "stderr: %s", file == "SYSLOG" ? (std::string("[GLOBAL SYSLOG]: ") + message).c_str() : message.c_str());
   } else {
     printf("stderr: %s: %s\n", file.c_str(), message.c_str());
   }

Original file line number	Diff line number	Diff line change
`@@ -126,7 +126,7 @@ void EPNMonitor::sendLog(const std::string& file, const std::string& message)`
`126`	`126`	`mLoggerContext->setField(InfoLogger::InfoLoggerContext::FieldName::Facility, ("stderr/" + file).substr(0, 31));`
`127`	`127`	`mLoggerContext->setField(InfoLogger::InfoLoggerContext::FieldName::Run, mRunNumber != 0 ? std::to_string(mRunNumber) : "unspecified");`
`128`	`128`	`static const InfoLogger::InfoLogger::InfoLoggerMessageOption opt = {InfoLogger::InfoLogger::Severity::Error, 3, InfoLogger::InfoLogger::undefinedMessageOption.errorCode, InfoLogger::InfoLogger::undefinedMessageOption.sourceFile, InfoLogger::InfoLogger::undefinedMessageOption.sourceLine};`
`129`		`- mLogger->log(opt, *mLoggerContext, "stderr: %s", message.c_str());`
	`129`	`+ mLogger->log(opt, *mLoggerContext, "stderr: %s", file == "SYSLOG" ? (std::string("[GLOBAL SYSLOG]: ") + message).c_str() : message.c_str());`
`130`	`130`	`} else {`
`131`	`131`	`printf("stderr: %s: %s\n", file.c_str(), message.c_str());`
`132`	`132`	`}`