From 669931e76de18aabb14f9ff873da4783f8c83d7a Mon Sep 17 00:00:00 2001 From: "Chou, Joseph (JC2555)" Date: Thu, 22 Mar 2018 11:22:35 -0400 Subject: ONAP code change for log files consolidation Code change for log files consolidation of PAP, PDP, BRMSGW, Console and db script Issue-ID: POLICY-562 Change-Id: I416ba7748b841bb2b1a31682e2b1631e279549e8 Signed-off-by: Chou, Joseph (JC2555) --- packages/base/src/files/etc/profile.d/env.sh | 2 ++ .../src/files/install/mysql/bin/cleanup_policy.sh | 8 +++++-- .../base/src/files/install/mysql/bin/db_backup.sh | 8 +++++-- .../src/files/install/mysql/bin/db_backup_data.sh | 8 +++++-- .../files/install/mysql/bin/db_backup_remote.sh | 9 +++++-- .../base/src/files/install/mysql/bin/db_restore.sh | 28 ++++++++++++++-------- .../src/files/install/mysql/bin/db_restore_data.sh | 7 ++++++ .../base/src/files/install/mysql/bin/db_upgrade.sh | 8 +++++-- .../files/install/mysql/bin/db_upgrade_remote.sh | 8 +++++-- .../install/servers/common/tomcat/conf/server.xml | 2 +- .../files/install/servers/configs/conf/server.xml | 2 +- .../files/install/servers/console/conf/server.xml | 2 +- 12 files changed, 67 insertions(+), 25 deletions(-) (limited to 'packages/base') diff --git a/packages/base/src/files/etc/profile.d/env.sh b/packages/base/src/files/etc/profile.d/env.sh index 56b44260b..14445fbfd 100644 --- a/packages/base/src/files/etc/profile.d/env.sh +++ b/packages/base/src/files/etc/profile.d/env.sh @@ -25,3 +25,5 @@ export KEYSTORE_PASSWD=${{KEYSTORE_PASSWD}} export JAVA_HOME=${{JAVA_HOME}} export PATH=${PATH}:${{POLICY_HOME}}/bin + +export POLICY_LOGS=${{POLICY_LOGS}} \ No newline at end of file diff --git a/packages/base/src/files/install/mysql/bin/cleanup_policy.sh b/packages/base/src/files/install/mysql/bin/cleanup_policy.sh index 1841d3c57..969d089c0 100644 --- a/packages/base/src/files/install/mysql/bin/cleanup_policy.sh +++ b/packages/base/src/files/install/mysql/bin/cleanup_policy.sh @@ -71,8 +71,12 @@ function cleanup_deleted_policy } # MAIN -LOG=$POLICY_HOME/logs/cleanup_policy_$DATE.log -ERR=$POLICY_HOME/logs/cleanup_policy_$DATE.err +if [ -z ${POLICY_LOGS} ]; then + POLICY_LOGS=/var/log/onap +fi +mkdir -p $POLICY_LOGS/policy/db +LOG=$POLICY_LOGS/policy/db/cleanup_policy_$DATE.log +ERR=$POLICY_LOGS/policy/db/cleanup_policy_$DATE.err echo "cleanup_policy.sh started ... `date`" | tee -a $LOG if [ $# -eq 3 ]; then DB_USER="${1}" diff --git a/packages/base/src/files/install/mysql/bin/db_backup.sh b/packages/base/src/files/install/mysql/bin/db_backup.sh index dca2017ff..75d15364f 100644 --- a/packages/base/src/files/install/mysql/bin/db_backup.sh +++ b/packages/base/src/files/install/mysql/bin/db_backup.sh @@ -63,6 +63,12 @@ function backup_database # MAIN +if [ -z ${POLICY_LOGS} ]; then + POLICY_LOGS=/var/log/onap +fi +mkdir -p $POLICY_LOGS/policy/db +LOG=$POLICY_LOGS/policy/db/db_backup_$DATE.log +ERR=$POLICY_LOGS/policy/db/db_backup_$DATE.err echo "db_backup.sh started ... `date`" | tee -a $LOG if [ $# -eq 3 ]; then DB_USER="${1}" @@ -71,8 +77,6 @@ if [ $# -eq 3 ]; then echo "DB_USER: $DB_USER" | tee -a $LOG DAILY_BACKUP_DIR=$POLICY_HOME/data/mysql/$DATE - LOG=$POLICY_HOME/logs/db_backup_$DATE.log - ERR=$POLICY_HOME/logs/db_backup_$DATE.err create_backup_dir backup_database diff --git a/packages/base/src/files/install/mysql/bin/db_backup_data.sh b/packages/base/src/files/install/mysql/bin/db_backup_data.sh index ee0b44732..b77885e7d 100644 --- a/packages/base/src/files/install/mysql/bin/db_backup_data.sh +++ b/packages/base/src/files/install/mysql/bin/db_backup_data.sh @@ -63,8 +63,12 @@ function backup_database # MAIN -LOG=$POLICY_HOME/logs/db_backup_data_$DATE.log -ERR=$POLICY_HOME/logs/db_backup_data_$DATE.err +if [ -z ${POLICY_LOGS} ]; then + POLICY_LOGS=/var/log/onap +fi +mkdir -p $POLICY_LOGS/onap/policy/db +LOG=$POLICY_LOGS/policy/db/db_backup_data_$DATE.log +ERR=$POLICY_LOGS/policy/db/db_backup_data_$DATE.err echo "db_backup_data.sh started ... `date`" | tee -a $LOG if [ $# -eq 3 ]; then DB_USER="${1}" diff --git a/packages/base/src/files/install/mysql/bin/db_backup_remote.sh b/packages/base/src/files/install/mysql/bin/db_backup_remote.sh index 212896942..72f31c33a 100644 --- a/packages/base/src/files/install/mysql/bin/db_backup_remote.sh +++ b/packages/base/src/files/install/mysql/bin/db_backup_remote.sh @@ -70,14 +70,19 @@ if [ $# -eq 4 ]; then DB_PASSWORD="${2}" DATABASE="${3}" DB_HOSTNAME="${4}" + if [ -z ${POLICY_LOGS} ]; then + POLICY_LOGS=/var/log/onap + fi + mkdir -p $POLICY_LOGS/policy/db + LOG=$POLICY_LOGS/policy/db/db_backup_remote_$DATE.log + ERR=$POLICY_LOGS/policy/db/db_backup_remote_$DATE.err + echo "db_backup_remote.sh for [$DATABASE]@[${DB_HOSTNAME}] started ... `date`" | tee -a $LOG echo "DB_USER : $DB_USER" | tee -a $LOG echo "DATABASE : $DATABASE" | tee -a $LOG echo "DB_HOSTNAME: $DB_HOSTNAME" | tee -a $LOG DAILY_BACKUP_DIR=$POLICY_HOME/data/mysql/$DATE - LOG=$POLICY_HOME/logs/db_backup_remote_$DATE.log - ERR=$POLICY_HOME/logs/db_backup_remote_$DATE.err create_backup_dir backup_database diff --git a/packages/base/src/files/install/mysql/bin/db_restore.sh b/packages/base/src/files/install/mysql/bin/db_restore.sh index d6e21df79..765b0cad3 100644 --- a/packages/base/src/files/install/mysql/bin/db_restore.sh +++ b/packages/base/src/files/install/mysql/bin/db_restore.sh @@ -38,40 +38,48 @@ BACKUP_FILE="" DATABASE="" TABLE="" TEMP_FILE=/tmp/db_restore_$$.sql +DATE=`date +"%Y%m%d"` +LOG="" function restore_all { - echo "restore_all started ...@`date`" - echo "Before restore table ..." + echo "restore_all started ...@`date`" | tee -a $LOG + echo "Before restore table ..." | tee -a $LOG echo "--" mysql -u${DB_USER} -p${DB_PASSWORD} < $BACKUP_FILE echo "--" - echo "restore_all completed ...@`date`" + echo "restore_all completed ...@`date`" | tee -a $LOG } function restore_table { database="${1}" table="${2}" - echo "restore_table [$database] [$table] started ...@`date`" + echo "restore_table [$database] [$table] started ...@`date`" | tee -a $LOG # extract sql statement from backup file - echo "use $database;" > $TEMP_FILE + echo "use $database;" > $TEMP_FILE echo "set foreign_key_checks=0; " >> $TEMP_FILE sed -n -e '/DROP TABLE IF EXISTS `'$table'`;/,/UNLOCK TABLES;/p' $BACKUP_FILE >> $TEMP_FILE echo "set foreign_key_checks=1; " >> $TEMP_FILE echo "--" cat $TEMP_FILE echo "--" - echo "Before restore table ..." + echo "Before restore table ..." | tee -a $LOG mysql -u${DB_USER} -p${DB_PASSWORD} < $TEMP_FILE echo "--" - echo "restore_table [$database] [$table] completed ...@`date`" + echo "restore_table [$database] [$table] completed ...@`date`" | tee -a $LOG } # MAIN -echo "db_restore.sh started ... `date`" +if [ -z ${POLICY_LOGS} ]; then + POLICY_LOGS=/var/log/onap +fi +mkdir -p $POLICY_LOGS/policy/db +LOG=$POLICY_LOGS/policy/db/db_restore_$DATE.log + +echo "db_restore.sh started ... `date`" | tee -a $LOG if [ $# -eq 5 ]; then DB_USER="${1}" DB_PASSWORD="${2}" @@ -86,7 +94,7 @@ if [ $# -eq 5 ]; then restore_all fi else - echo "BACKUP FILE NOT FOUND: $BACKUP_FILE" + echo "BACKUP FILE NOT FOUND: $BACKUP_FILE" | tee -a $LOG fi else echo "Usage : db_restore.sh db_user_id db_password backup_file database table_name" @@ -94,4 +102,4 @@ else fi rm -f $TEMP_FILE -echo "db_restore.sh completed ... `date`" +echo "db_restore.sh completed ... `date`" | tee -a $LOG diff --git a/packages/base/src/files/install/mysql/bin/db_restore_data.sh b/packages/base/src/files/install/mysql/bin/db_restore_data.sh index c4fec027f..ec0874a67 100644 --- a/packages/base/src/files/install/mysql/bin/db_restore_data.sh +++ b/packages/base/src/files/install/mysql/bin/db_restore_data.sh @@ -40,6 +40,8 @@ BACKUP_FILE="" DATABASE="" TABLE="" TEMP_FILE=/tmp/db_restore_data_$$.sql +DATE=`date +"%Y%m%d"` +LOG="" function restore_all { @@ -85,6 +87,11 @@ if [ $# -eq 5 ]; then typeset -l DATABASE="${4}" typeset -l TABLE="${5}" echo "DB_USER: $DB_USER" + if [ -z ${POLICY_LOGS} ]; then + POLICY_LOGS=/var/log/onap + fi + mkdir -p $POLICY_LOGS/policy/db + LOG=$POLICY_LOGS/policy/db/db_restore_data_$DATE.log if [ -f $BACKUP_FILE ]; then if [ "${TABLE}" != "all" ]; then restore_table ${DATABASE} ${TABLE} diff --git a/packages/base/src/files/install/mysql/bin/db_upgrade.sh b/packages/base/src/files/install/mysql/bin/db_upgrade.sh index 87d5d9bd7..85a9218f5 100644 --- a/packages/base/src/files/install/mysql/bin/db_upgrade.sh +++ b/packages/base/src/files/install/mysql/bin/db_upgrade.sh @@ -124,8 +124,12 @@ function check_directory # MAIN #check_directory -LOG=$POLICY_HOME/logs/db_upgrade_$DATE.log -ERR=$POLICY_HOME/logs/db_upgrade_$DATE.err +if [ -z ${POLICY_LOGS} ]; then + POLICY_LOGS=/var/log/onap +fi +mkdir -p $POLICY_LOGS/policy/db +LOG=$POLICY_LOGS/policy/db/db_upgrade_$DATE.log +ERR=$POLICY_LOGS/policy/db/db_upgrade_$DATE.err echo "db_upgrade.sh started ..." | tee -a $LOG if [ $# -eq 3 ]; then TARGET_RELEASE="${1}" diff --git a/packages/base/src/files/install/mysql/bin/db_upgrade_remote.sh b/packages/base/src/files/install/mysql/bin/db_upgrade_remote.sh index a10ac2173..c4316816e 100644 --- a/packages/base/src/files/install/mysql/bin/db_upgrade_remote.sh +++ b/packages/base/src/files/install/mysql/bin/db_upgrade_remote.sh @@ -146,8 +146,12 @@ function check_directory # MAIN #check_directory -LOG=$POLICY_HOME/logs/db_upgrade_remote_$DATE.log -ERR=$POLICY_HOME/logs/db_upgrade_remote_$DATE.err +if [ -z ${POLICY_LOGS} ]; then + POLICY_LOGS=/var/log/onap +fi +mkdir -p $POLICY_LOGS/policy/db +LOG=$POLICY_LOGS/policy/db/db_upgrade_remote_$DATE.log +ERR=$POLICY_LOGS/policy/db/db_upgrade_remote_$DATE.err echo "db_upgrade_remote.sh started ..." | tee -a $LOG if [ $# -eq 3 ]; then DB_UPGRADE_USER="${1}" diff --git a/packages/base/src/files/install/servers/common/tomcat/conf/server.xml b/packages/base/src/files/install/servers/common/tomcat/conf/server.xml index 787347283..0aca4ead7 100644 --- a/packages/base/src/files/install/servers/common/tomcat/conf/server.xml +++ b/packages/base/src/files/install/servers/common/tomcat/conf/server.xml @@ -157,7 +157,7 @@ - diff --git a/packages/base/src/files/install/servers/configs/conf/server.xml b/packages/base/src/files/install/servers/configs/conf/server.xml index 2a6191e99..a9bf21bbe 100644 --- a/packages/base/src/files/install/servers/configs/conf/server.xml +++ b/packages/base/src/files/install/servers/configs/conf/server.xml @@ -159,7 +159,7 @@ - diff --git a/packages/base/src/files/install/servers/console/conf/server.xml b/packages/base/src/files/install/servers/console/conf/server.xml index 53d563bba..b3fa674b0 100644 --- a/packages/base/src/files/install/servers/console/conf/server.xml +++ b/packages/base/src/files/install/servers/console/conf/server.xml @@ -162,7 +162,7 @@ - -- cgit 1.2.3-korg