Merge "ONAP log files consolidation"

8 files changed, 60 insertions, 23 deletions

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..8220705a3 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}"
@@ -88,5 +92,4 @@ if [ $# -eq 3 ]; then
 else
   echo "Usage  : cleanup_policy.sh db_user_id  db_user_password retention_period" 
   echo "Example: cleanup_policy.sh policy_user password         90" 
-fi
-
+fi
\ No newline at end of file
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..1f62f73fc 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
@@ -80,5 +84,4 @@ if [ $# -eq 3 ]; then
 else
   echo "Usage  : db_backup.sh db_user_id  db_user_password database" 
   echo "Example: db_backup.sh policy_user password         onap_sdk" 
-fi
-
+fi
\ No newline at end of file
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..53710af36 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}"
@@ -80,5 +84,4 @@ if [ $# -eq 3 ]; then
 else
   echo "Usage  : db_backup_data.sh db_user_id  db_user_password database" 
   echo "Example: db_backup_data.sh policy_user password         xacml" 
-fi
-
+fi
\ No newline at end of file
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 0f63535c7..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,6 +38,8 @@ BACKUP_FILE=""
 DATABASE=""
 TABLE=""
 TEMP_FILE=/tmp/db_restore_$$.sql
+DATE=`date +"%Y%m%d"`
+LOG=""
 
 function restore_all
 {
@@ -54,7 +56,7 @@ 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 "set foreign_key_checks=0; " >> $TEMP_FILE
@@ -66,12 +68,18 @@ function 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}"