diff --git a/oam/install_scripts/syslogSetup.sh b/oam/install_scripts/syslogSetup.sh index 5a409d356..87c1b0cf5 100755 --- a/oam/install_scripts/syslogSetup.sh +++ b/oam/install_scripts/syslogSetup.sh @@ -155,11 +155,6 @@ install() { checkSyslog if [ ! -z "$syslog_conf" ] ; then $installdir/bin/setConfig -d Installation SystemLogConfigFile ${syslog_conf} >/dev/null 2>&1 - if [ "$syslog_conf" != /etc/rsyslog.d/columnstore.conf ]; then - $SUDO rm -f ${syslog_conf}.columnstoreSave - $SUDO cp ${syslog_conf} ${syslog_conf}.columnstoreSave >/dev/null 2>&1 - $SUDO sed -i '/# MariaDB/,$d' ${syslog_conf}.columnstoreSave > /dev/null 2>&1 - fi egrep -qs 'MariaDB Columnstore Database Platform Logging' ${syslog_conf} if [ $? -ne 0 ]; then @@ -179,9 +174,9 @@ if [ ! -z "$syslog_conf" ] ; then $SUDO /etc/init.d/syslog restart > /dev/null 2>&1 $SUDO /etc/init.d/syslog-ng restart > /dev/null 2>&1 - systemctl restart rsyslog.service > /dev/null 2>&1 - systemctl restart syslog.service > /dev/null 2>&1 - systemctl restart syslog-ng.service > /dev/null 2>&1 + $SUDO systemctl restart rsyslog.service > /dev/null 2>&1 + $SUDO systemctl restart syslog.service > /dev/null 2>&1 + $SUDO systemctl restart syslog-ng.service > /dev/null 2>&1 fi @@ -215,9 +210,9 @@ if [ ! -z "$syslog_conf" ] ; then $SUDO /etc/init.d/syslog restart > /dev/null 2>&1 $SUDO /etc/init.d/syslog-ng restart > /dev/null 2>&1 - systemctl restart rsyslog.service > /dev/null 2>&1 - systemctl restart syslog.service > /dev/null 2>&1 - systemctl restart syslog-ng.service > /dev/null 2>&1 + $SUDO systemctl restart rsyslog.service > /dev/null 2>&1 + $SUDO systemctl restart syslog.service > /dev/null 2>&1 + $SUDO systemctl restart syslog-ng.service > /dev/null 2>&1 $installdir/bin/setConfig -d Installation SystemLogConfigFile "unassigned" diff --git a/oamapps/mcsadmin/mcsadmin.cpp b/oamapps/mcsadmin/mcsadmin.cpp index 1229f24c2..e90e31559 100644 --- a/oamapps/mcsadmin/mcsadmin.cpp +++ b/oamapps/mcsadmin/mcsadmin.cpp @@ -5011,7 +5011,7 @@ int processCommand(string* arguments) if (oam.checkLogStatus("/tmp/columnstore.txt", "Name")) system("cat /tmp/columnstore.txt"); else { - system("dpkg -s mariadb-columnstore > /tmp/columnstore.txt 2>&1"); + system("dpkg -s mariadb-columnstore-platform > /tmp/columnstore.txt 2>&1"); if (oam.checkLogStatus("/tmp/columnstore.txt", "Status: install")) system("cat /tmp/columnstore.txt"); else {