database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-06-16 14:20:56 +03:00
Code Activity

MCOL-4598: Fix the syslog setup script. Add syslog options for broken/non-syslog setup.

Browse Source
This commit is contained in:
benthompson15
2021-04-29 16:33:48 -05:00
parent 374103220c
commit 1eea9f9e47
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
oam/install_scripts/columnstoreSyslogSetup.sh.in
View File

@ -107,15 +107,15 @@ if [ "$daemon" = "syslog-ng" ]; then
elif [ "$daemon" = "rsyslog" ]; then elif [ "$daemon" = "rsyslog" ]; then
#check if rsyslog version 7 or greater #check if rsyslog version 7 or greater
rsyslogd -v > ${tmpDir}/rsyslog.ver 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 if [ $cnt -gt 0 ]; then
rsyslog7=1 rsyslog7=1
fi fi
cnt=`grep "rsyslogd 8" ${tmpDir}/rsyslog.ver | wc -l` cnt=`grep "rsyslogd \+8" ${tmpDir}/rsyslog.ver | wc -l`
if [ $cnt -gt 0 ]; then if [ $cnt -gt 0 ]; then
rsyslog7=1 rsyslog7=1
fi fi
cnt=`grep "rsyslogd 9" ${tmpDir}/rsyslog.ver | wc -l` cnt=`grep "rsyslogd \+9" ${tmpDir}/rsyslog.ver | wc -l`
if [ $cnt -gt 0 ]; then if [ $cnt -gt 0 ]; then
rsyslog7=1 rsyslog7=1
fi fi

2
storage-manager/src/SMLogging.cpp
View File

@ -35,7 +35,7 @@ SMLogging::SMLogging()
{ {
//TODO: make this configurable //TODO: make this configurable
setlogmask (LOG_UPTO (LOG_DEBUG)); 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() SMLogging::~SMLogging()

10
utils/loggingcpp/messagelog.cpp
View File

@ -179,21 +179,21 @@ const string MessageLog::format(const Message& msg, const char prefix)
void MessageLog::logDebugMessage(const Message& msg) 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()); ::syslog(LOG_DEBUG, "%s", format(msg, 'D').c_str());
::closelog(); ::closelog();
} }
void MessageLog::logInfoMessage(const Message& msg) 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()); ::syslog(LOG_INFO, "%s", format(msg, 'I').c_str());
::closelog(); ::closelog();
} }
void MessageLog::logWarningMessage(const Message& msg) 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()); ::syslog(LOG_WARNING, "%s", format(msg, 'W').c_str());
::closelog(); ::closelog();
} }
@ -201,14 +201,14 @@ void MessageLog::logWarningMessage(const Message& msg)
void MessageLog::logErrorMessage(const Message& msg) void MessageLog::logErrorMessage(const Message& msg)
{ {
// @bug 24 use 'E' instead of 'S' // @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()); ::syslog(LOG_ERR, "%s", format(msg, 'E').c_str());
::closelog(); ::closelog();
} }
void MessageLog::logCriticalMessage(const Message& msg) 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()); ::syslog(LOG_CRIT, "%s", format(msg, 'C').c_str());
::closelog(); ::closelog();
} }