database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-09-02 12:41:17 +03:00
Code Activity

MCOL-617

Browse Source
This commit is contained in:
david hill
2017-03-13 17:00:11 -05:00
parent f0ded2ea25
commit 52e499dde4
2 changed files with 7 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
oam/install_scripts/syslogSetup.sh
View File

@@ -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"

2
oamapps/mcsadmin/mcsadmin.cpp
View File

@@ -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 {