diff --git a/oam/install_scripts/columnstoreSyslog b/oam/install_scripts/columnstoreSyslog index e9adb7706..37dc0335a 100644 --- a/oam/install_scripts/columnstoreSyslog +++ b/oam/install_scripts/columnstoreSyslog @@ -4,4 +4,3 @@ local1.=err -/var/log/mariadb/columnstore/err.log local1.=warning -/var/log/mariadb/columnstore/warning.log local1.=info -/var/log/mariadb/columnstore/info.log local1.=debug -/var/log/mariadb/columnstore/debug.log -local2.=crit -/var/log/mariadb/columnstore/data/data_mods.log diff --git a/oam/install_scripts/columnstoreSyslog-ng b/oam/install_scripts/columnstoreSyslog-ng index b4b80e1c5..c7ae76744 100755 --- a/oam/install_scripts/columnstoreSyslog-ng +++ b/oam/install_scripts/columnstoreSyslog-ng @@ -40,9 +40,6 @@ destination d_debug{ file("/var/log/mariadb/columnstore/debug.log"); }; -destination d_data_mods{ - file("/var/log/mariadb/columnstore/data/data_mods.log"); -}; log{ source(s_columnstore); @@ -70,9 +67,4 @@ log{ filter(f_local1debug); destination(d_debug); }; -log{ - source(s_columnstore); - filter(f_local2crit); - destination(d_data_mods); -}; diff --git a/oam/install_scripts/columnstoreSyslog7 b/oam/install_scripts/columnstoreSyslog7 index 05551200e..87bababaa 100644 --- a/oam/install_scripts/columnstoreSyslog7 +++ b/oam/install_scripts/columnstoreSyslog7 @@ -4,5 +4,4 @@ local1.err -/var/log/mariadb/columnstore/err.log local1.warning -/var/log/mariadb/columnstore/warning.log local1.info -/var/log/mariadb/columnstore/info.log local1.debug -/var/log/mariadb/columnstore/debug.log -local2.crit -/var/log/mariadb/columnstore/data/data_mods.log diff --git a/oam/install_scripts/post-install b/oam/install_scripts/post-install index c7dbd537d..b382cd333 100755 --- a/oam/install_scripts/post-install +++ b/oam/install_scripts/post-install @@ -106,7 +106,6 @@ test -d /var/log/mariadb/columnstore/archive || mkdir /var/log/mariadb/columnsto test -d /var/log/mariadb/columnstore/corefiles || mkdir /var/log/mariadb/columnstore/corefiles >/dev/null 2>&1 test -d /var/log/mariadb/columnstore/trace || mkdir /var/log/mariadb/columnstore/trace >/dev/null 2>&1 test -h /var/log/mariadb/columnstore/data && rm -f /var/log/mariadb/columnstore/data -test -d /var/log/mariadb/columnstore/data || mkdir /var/log/mariadb/columnstore/data >/dev/null 2>&1 # make sure trace dir is world-writable and sticky chmod 1755 /var/log/mariadb/columnstore/trace >/dev/null 2>&1 test -d $installdir/data || mkdir $installdir/data diff --git a/oam/oamcpp/liboamcpp.h b/oam/oamcpp/liboamcpp.h index b2be8c81a..579e12ffa 100644 --- a/oam/oamcpp/liboamcpp.h +++ b/oam/oamcpp/liboamcpp.h @@ -363,7 +363,6 @@ namespace oam "local1.=warning -/var/log/mariadb/columnstore/warning.log", "local1.=info -/var/log/mariadb/columnstore/info.log", "local1.=debug -/var/log/mariadb/columnstore/debug.log", - "local2.=crit -/var/log/mariadb/columnstore/data/data_mods.log", "" }; @@ -387,7 +386,6 @@ namespace oam LEVEL_WARNING = 0x4, LEVEL_INFO = 0x8, LEVEL_DEBUG = 0x10, - LEVEL_DATA = 0x20 }; /** @brief Alarm IDs diff --git a/oamapps/mcsadmin/mcsadmin.cpp b/oamapps/mcsadmin/mcsadmin.cpp index 4511c876a..8b7018eea 100644 --- a/oamapps/mcsadmin/mcsadmin.cpp +++ b/oamapps/mcsadmin/mcsadmin.cpp @@ -3357,8 +3357,6 @@ int processCommand(string* arguments) cout << "Info "; if ( ((data & LEVEL_DEBUG) ? 1 : 0) == 1 ) cout << "Debug "; - if ( ((data & LEVEL_DATA) ? 1 : 0) == 1 ) - cout << "Data"; cout << endl; } } diff --git a/procmon/processmonitor.cpp b/procmon/processmonitor.cpp index 658228cb5..d7325aa85 100644 --- a/procmon/processmonitor.cpp +++ b/procmon/processmonitor.cpp @@ -3273,9 +3273,6 @@ int ProcessMonitor::getConfigLog() case 5: configData = configData | LEVEL_DEBUG; break; - case 6: - configData = configData | LEVEL_DATA; - break; default: break; } //end of switch