From: Jorge Hernandez Date: Mon, 26 Mar 2018 13:55:11 +0000 (+0000) Subject: Merge "ONAP code change for log files consolidation" X-Git-Tag: v1.2.0~34 X-Git-Url: https://gerrit.onap.org/r/gitweb?p=policy%2Fengine.git;a=commitdiff_plain;h=cc7dca9a21765dca0ba336f27659a3852f6a15d9;hp=c8bed1e392b935ec50aaeeb5fb82d25a9568b790 Merge "ONAP code change for log files consolidation" --- diff --git a/BRMSGateway/src/main/resources/logback.xml b/BRMSGateway/src/main/resources/logback.xml index c01117ba7..b9a34d729 100644 --- a/BRMSGateway/src/main/resources/logback.xml +++ b/BRMSGateway/src/main/resources/logback.xml @@ -21,15 +21,15 @@ - + - + - - + + diff --git a/ONAP-PAP-REST/src/main/resources/log4j.properties b/ONAP-PAP-REST/src/main/resources/log4j.properties index 04f3233c1..7a1a6bea3 100644 --- a/ONAP-PAP-REST/src/main/resources/log4j.properties +++ b/ONAP-PAP-REST/src/main/resources/log4j.properties @@ -28,7 +28,7 @@ log4j.rootLogger=INFO, FILE # FILE appender log4j.appender.FILE=org.apache.log4j.DailyRollingFileAppender -log4j.appender.FILE.File=${catalina.base}/logs/pap-rest.log +log4j.appender.FILE.File=${{POLICY_LOGS}}/policy/pap/pap-rest.log log4j.appender.FILE.ImmediateFlush=true log4j.appender.FILE.Threshold=debug log4j.appender.FILE.append=true @@ -47,7 +47,7 @@ log4j.appender.FILE.layout.ConversionPattern=%d{yyyy-MM-dd'T'HH:mm:ss}{GMT+0}+00 log4j.logger.xacml.request=INFO, REQUEST_LOG log4j.appender.REQUEST_LOG=org.apache.log4j.DailyRollingFileAppender -log4j.appender.REQUEST_LOG.File=${catalina.base}/logs/pap-rest-reqres.log +log4j.appender.REQUEST_LOG.File=${{POLICY_LOGS}}/policy/pap/pap-rest-reqres.log log4j.appender.REQUEST_LOG.ImmediateFlush=true log4j.appender.REQUEST_LOG.Threshold=debug log4j.appender.REQUEST_LOG.append=true @@ -63,7 +63,7 @@ log4j.logger.auditLogger=INFO,AUDIT_LOG log4j.additivity.auditLogger=false log4j.appender.AUDIT_LOG=org.apache.log4j.DailyRollingFileAppender -log4j.appender.AUDIT_LOG.File=${catalina.base}/logs/audit.log +log4j.appender.AUDIT_LOG.File=${{POLICY_LOGS}}/policy/pap/audit.log log4j.appender.AUDIT_LOG.Append=true log4j.appender.AUDIT_LOG.DatePattern='.'yyyy-MM-dd log4j.appender.AUDIT_LOG.threshold=INFO diff --git a/ONAP-PAP-REST/src/main/resources/logback.xml b/ONAP-PAP-REST/src/main/resources/logback.xml index 3595b2432..51656311e 100644 --- a/ONAP-PAP-REST/src/main/resources/logback.xml +++ b/ONAP-PAP-REST/src/main/resources/logback.xml @@ -21,15 +21,15 @@ - + - + - - + + @@ -84,8 +84,8 @@ --> - - + + diff --git a/ONAP-PDP-REST/src/main/resources/log4j.properties b/ONAP-PDP-REST/src/main/resources/log4j.properties index 6e5cfac93..5f5e4d5bc 100644 --- a/ONAP-PDP-REST/src/main/resources/log4j.properties +++ b/ONAP-PDP-REST/src/main/resources/log4j.properties @@ -28,7 +28,7 @@ log4j.rootLogger=INFO, FILE # FILE appender log4j.appender.FILE=org.apache.log4j.DailyRollingFileAppender -log4j.appender.FILE.File=${catalina.base}/logs/pdp-rest.log +log4j.appender.FILE.File=${{POLICY_LOGS}}/policy/pdpx/pdp-rest.log log4j.appender.FILE.ImmediateFlush=true log4j.appender.FILE.Threshold=debug log4j.appender.FILE.append=true @@ -47,7 +47,7 @@ log4j.appender.FILE.layout.ConversionPattern=%d{yyyy-MM-dd'T'HH:mm:ss}{GMT+0}+00 log4j.logger.xacml.request=INFO, REQUEST_LOG log4j.appender.REQUEST_LOG=org.apache.log4j.DailyRollingFileAppender -log4j.appender.REQUEST_LOG.File=${catalina.base}/logs/pdp-rest-reqres.log +log4j.appender.REQUEST_LOG.File=${{POLICY_LOGS}}/policy/pdpx/pdp-rest-reqres.log log4j.appender.REQUEST_LOG.ImmediateFlush=true log4j.appender.REQUEST_LOG.Threshold=debug log4j.appender.REQUEST_LOG.append=true @@ -63,7 +63,7 @@ log4j.logger.auditLogger=INFO,AUDIT_LOG log4j.additivity.auditLogger=false log4j.appender.AUDIT_LOG=org.apache.log4j.DailyRollingFileAppender -log4j.appender.AUDIT_LOG.File=${catalina.base}/logs/audit.log +log4j.appender.AUDIT_LOG.File=${{POLICY_LOGS}}/policy/pdpx/audit.log log4j.appender.AUDIT_LOG.Append=true log4j.appender.AUDIT_LOG.DatePattern='.'yyyy-MM-dd log4j.appender.AUDIT_LOG.threshold=INFO diff --git a/ONAP-PDP-REST/src/main/resources/logback.xml b/ONAP-PDP-REST/src/main/resources/logback.xml index 677b0d0d7..6e4064dfc 100644 --- a/ONAP-PDP-REST/src/main/resources/logback.xml +++ b/ONAP-PDP-REST/src/main/resources/logback.xml @@ -21,15 +21,15 @@ - + - + - - + + @@ -83,8 +83,8 @@ --> - - + + diff --git a/ONAP-PDP/logging.properties b/ONAP-PDP/logging.properties index d25697ea8..e6f11bda4 100644 --- a/ONAP-PDP/logging.properties +++ b/ONAP-PDP/logging.properties @@ -24,6 +24,6 @@ handlers = java.util.logging.ConsoleHandler, java.util.logging.FileHandler java.util.logging.ConsoleHandler.level = INFO java.util.logging.FileHandler.level = INFO -java.util.logging.FileHandler.pattern=%h/xacml_log%u.log +java.util.logging.FileHandler.pattern=${{POLICY_LOGS}/policy/pdpx/xacml_log%u.log java.util.logging.ConsoleHandler.formatter = java.util.logging.SimpleFormatter java.util.logging.FileHandler.formatter = java.util.logging.SimpleFormatter diff --git a/ONAP-SDK-APP/src/main/resources/logback.xml b/ONAP-SDK-APP/src/main/resources/logback.xml index d19b1ba5a..8e99b0a15 100644 --- a/ONAP-SDK-APP/src/main/resources/logback.xml +++ b/ONAP-SDK-APP/src/main/resources/logback.xml @@ -28,15 +28,16 @@ - + + - + - + - + diff --git a/PolicyEngineAPI/src/main/resources/logback.xml b/PolicyEngineAPI/src/main/resources/logback.xml index 347466bcc..e69f01dd2 100644 --- a/PolicyEngineAPI/src/main/resources/logback.xml +++ b/PolicyEngineAPI/src/main/resources/logback.xml @@ -21,15 +21,15 @@ - + - + - - + + 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 @@ - diff --git a/packages/docker/src/main/docker/docker-install.sh b/packages/docker/src/main/docker/docker-install.sh index e8b9aaf14..c15f36f38 100644 --- a/packages/docker/src/main/docker/docker-install.sh +++ b/packages/docker/src/main/docker/docker-install.sh @@ -151,6 +151,7 @@ function configure_component() { SED_LINE+=" -e 's!\${{KEYSTORE_PASSWD}}!${KEYSTORE_PASSWD}!g' " SED_LINE+=" -e 's!\${{JAVA_HOME}}!${JAVA_HOME}!g' " SED_LINE+=" -e 's!\${{COMPONENT_TYPE}}!${COMPONENT_TYPE}!g' " + SED_LINE+=" -e 's!\${{POLICY_LOGS}}!${POLICY_LOGS}!g' " while read line || [ -n "${line}" ]; do if [[ -n $line ]] && [[ $line != \#* ]]; then @@ -658,6 +659,12 @@ if [[ -z ${POLICY_GROUP} ]]; then exit 1 fi +if [[ -z ${POLICY_LOGS} ]]; then + echo "POLICY_LOGS environment variable NOT set, default to /var/log" + export POLICY_LOGS="/var/log/onap" +fi + + FQDN=$(hostname -f 2> /dev/null) if [[ $? != 0 || -z ${FQDN} ]]; then echo "error: cannot determine the FQDN for this host $(hostname)." diff --git a/packages/install/src/files/base.conf b/packages/install/src/files/base.conf index cd08d4a41..a64cd3ee7 100644 --- a/packages/install/src/files/base.conf +++ b/packages/install/src/files/base.conf @@ -17,3 +17,5 @@ max_fpc_update_interval=60 test_via_jmx=false ENVIRONMENT=TEST + +POLICY_LOGS=/var/log/onap \ No newline at end of file diff --git a/packages/install/src/files/paplp.conf b/packages/install/src/files/paplp.conf index f5a6d096b..ec7578be7 100755 --- a/packages/install/src/files/paplp.conf +++ b/packages/install/src/files/paplp.conf @@ -4,8 +4,8 @@ LOGPARSER_X_MS_MB=1024 LOGPARSER_X_MX_MB=1024 SERVER=https://${{FQDN}}:9091/pap/ -LOGPATH=${{POLICY_HOME}}/servers/pap/logs/pap-rest.log -PARSERLOGPATH=IntegrityMonitor.log +LOGPATH=${{POLICY_LOGS}}/policy/pap/pap-rest.log +PARSERLOGPATH=${{POLICY_LOGS}}/policy/pap/IntegrityMonitor.log node_type=logparser # the java property is RESOURCE_NAME (uppercase), but the conf parameter is lowercase diff --git a/packages/install/src/files/pdplp.conf b/packages/install/src/files/pdplp.conf index 750537819..f791a3f79 100755 --- a/packages/install/src/files/pdplp.conf +++ b/packages/install/src/files/pdplp.conf @@ -4,8 +4,8 @@ LOGPARSER_X_MS_MB=1024 LOGPARSER_X_MX_MB=1024 SERVER=https://${{FQDN}}:8081/pdp/ -LOGPATH=${{POLICY_HOME}}/servers/pdp/logs/pdp-rest.log -PARSERLOGPATH=IntegrityMonitor.log +LOGPATH=${{POLICY_LOGS}}/policy/pdpx/pdp-rest.log +PARSERLOGPATH==${{POLICY_LOGS}}/policy/pdpx/IntegrityMonitor.log node_type=logparser # the java property is RESOURCE_NAME (uppercase), but the conf parameter is lowercase