From 1eea9f9e47cddabf307d068c16a95f0884d10251 Mon Sep 17 00:00:00 2001 From: benthompson15 Date: Thu, 29 Apr 2021 16:33:48 -0500 Subject: [PATCH] MCOL-4598: Fix the syslog setup script. Add syslog options for broken/non-syslog setup. --- oam/install_scripts/columnstoreSyslogSetup.sh.in | 6 +++--- storage-manager/src/SMLogging.cpp | 2 +- utils/loggingcpp/messagelog.cpp | 10 +++++----- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/oam/install_scripts/columnstoreSyslogSetup.sh.in b/oam/install_scripts/columnstoreSyslogSetup.sh.in index 8b75934a4..9f569ea8b 100755 --- a/oam/install_scripts/columnstoreSyslogSetup.sh.in +++ b/oam/install_scripts/columnstoreSyslogSetup.sh.in @@ -107,15 +107,15 @@ if [ "$daemon" = "syslog-ng" ]; then elif [ "$daemon" = "rsyslog" ]; then #check if rsyslog version 7 or greater rsyslogd -v > ${tmpDir}/rsyslog.ver - cnt=`grep "rsyslogd 7" ${tmpDir}/rsyslog.ver | wc -l` + cnt=`grep "rsyslogd \+7" ${tmpDir}/rsyslog.ver | wc -l` if [ $cnt -gt 0 ]; then rsyslog7=1 fi - cnt=`grep "rsyslogd 8" ${tmpDir}/rsyslog.ver | wc -l` + cnt=`grep "rsyslogd \+8" ${tmpDir}/rsyslog.ver | wc -l` if [ $cnt -gt 0 ]; then rsyslog7=1 fi - cnt=`grep "rsyslogd 9" ${tmpDir}/rsyslog.ver | wc -l` + cnt=`grep "rsyslogd \+9" ${tmpDir}/rsyslog.ver | wc -l` if [ $cnt -gt 0 ]; then rsyslog7=1 fi diff --git a/storage-manager/src/SMLogging.cpp b/storage-manager/src/SMLogging.cpp index d029f19d3..21a4e4a96 100644 --- a/storage-manager/src/SMLogging.cpp +++ b/storage-manager/src/SMLogging.cpp @@ -35,7 +35,7 @@ SMLogging::SMLogging() { //TODO: make this configurable setlogmask (LOG_UPTO (LOG_DEBUG)); - openlog ("StorageManager", LOG_PID | LOG_NDELAY, LOG_LOCAL1); + openlog ("StorageManager", LOG_PID | LOG_NDELAY | LOG_PERROR | LOG_CONS, LOG_LOCAL1); } SMLogging::~SMLogging() diff --git a/utils/loggingcpp/messagelog.cpp b/utils/loggingcpp/messagelog.cpp index 6ddda51dd..1fedc2039 100644 --- a/utils/loggingcpp/messagelog.cpp +++ b/utils/loggingcpp/messagelog.cpp @@ -179,21 +179,21 @@ const string MessageLog::format(const Message& msg, const char prefix) void MessageLog::logDebugMessage(const Message& msg) { - ::openlog(SubsystemID[fLogData.fSubsysID].c_str(), 0 | LOG_PID, fFacility); + ::openlog(SubsystemID[fLogData.fSubsysID].c_str(), 0 | LOG_PID | LOG_PERROR | LOG_CONS, fFacility); ::syslog(LOG_DEBUG, "%s", format(msg, 'D').c_str()); ::closelog(); } void MessageLog::logInfoMessage(const Message& msg) { - ::openlog(SubsystemID[fLogData.fSubsysID].c_str(), 0 | LOG_PID, fFacility); + ::openlog(SubsystemID[fLogData.fSubsysID].c_str(), 0 | LOG_PID | LOG_PERROR | LOG_CONS, fFacility); ::syslog(LOG_INFO, "%s", format(msg, 'I').c_str()); ::closelog(); } void MessageLog::logWarningMessage(const Message& msg) { - ::openlog(SubsystemID[fLogData.fSubsysID].c_str(), 0 | LOG_PID, fFacility); + ::openlog(SubsystemID[fLogData.fSubsysID].c_str(), 0 | LOG_PID | LOG_PERROR | LOG_CONS, fFacility); ::syslog(LOG_WARNING, "%s", format(msg, 'W').c_str()); ::closelog(); } @@ -201,14 +201,14 @@ void MessageLog::logWarningMessage(const Message& msg) void MessageLog::logErrorMessage(const Message& msg) { // @bug 24 use 'E' instead of 'S' - ::openlog(SubsystemID[fLogData.fSubsysID].c_str(), 0 | LOG_PID, fFacility); + ::openlog(SubsystemID[fLogData.fSubsysID].c_str(), 0 | LOG_PID | LOG_PERROR | LOG_CONS, fFacility); ::syslog(LOG_ERR, "%s", format(msg, 'E').c_str()); ::closelog(); } void MessageLog::logCriticalMessage(const Message& msg) { - ::openlog(SubsystemID[fLogData.fSubsysID].c_str(), 0 | LOG_PID, fFacility); + ::openlog(SubsystemID[fLogData.fSubsysID].c_str(), 0 | LOG_PID | LOG_PERROR | LOG_CONS, fFacility); ::syslog(LOG_CRIT, "%s", format(msg, 'C').c_str()); ::closelog(); }