diff options
Diffstat (limited to 'packages')
20 files changed, 271 insertions, 32 deletions
diff --git a/packages/base/src/files/etc/profile.d/env.sh b/packages/base/src/files/etc/profile.d/env.sh index 56b44260b..2484bbc42 100644 --- a/packages/base/src/files/etc/profile.d/env.sh +++ b/packages/base/src/files/etc/profile.d/env.sh @@ -21,6 +21,7 @@ export POLICY_HOME=${{POLICY_HOME}} export POLICY_USER=${{POLICY_USER}} export POLICY_GROUP=${{POLICY_GROUP}} +export POLICY_LOGS=${{POLICY_LOGS}} export KEYSTORE_PASSWD=${{KEYSTORE_PASSWD}} export JAVA_HOME=${{JAVA_HOME}} 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}" diff --git a/packages/base/src/files/install/servers/brmsgw/init.d/brmsgw b/packages/base/src/files/install/servers/brmsgw/init.d/brmsgw index c3b406b42..998a36976 100644 --- a/packages/base/src/files/install/servers/brmsgw/init.d/brmsgw +++ b/packages/base/src/files/install/servers/brmsgw/init.d/brmsgw @@ -48,7 +48,7 @@ function um_start() { JAVA_OPTS=("${JVM_JAVA_OPTS[@]}" "${JMX_JAVA_OPTS[@]}" "${JVM_SECURITY[@]}") cd $POLICY_HOME/servers/brmsgw - nohup $JAVA_HOME/bin/java -jar "${JAVA_OPTS[@]}" $POLICY_HOME/servers/brmsgw/BRMSGateway.jar>> $POLICY_HOME/logs/brmsgw.log 2>&1 & + nohup $JAVA_HOME/bin/java -jar "${JAVA_OPTS[@]}" $POLICY_HOME/servers/brmsgw/BRMSGateway.jar>> $POLICY_LOGS/policy/brmsgw/brmsgw.log 2>&1 & RETVAL=$? } diff --git a/packages/base/src/files/install/servers/common/logparser/init.d/logparserd b/packages/base/src/files/install/servers/common/logparser/init.d/logparserd index 37221b9c3..e4ad903bc 100755 --- a/packages/base/src/files/install/servers/common/logparser/init.d/logparserd +++ b/packages/base/src/files/install/servers/common/logparser/init.d/logparserd @@ -25,7 +25,7 @@ function um_start() { # Redirects default and error output to a log file cd ${POLICY_HOME}/servers/${COMPONENT}/bin - nohup $JAVA_HOME/bin/java -jar ${JAVA_OPTS} ${SERVICE} ${SERVER} ${LOGTYPE} >> ${POLICY_HOME}/servers/${COMPONENT}/logs/stdout 2>&1 & + nohup $JAVA_HOME/bin/java -jar ${JAVA_OPTS} ${SERVICE} ${SERVER} ${LOGTYPE} >> ${POLICY_LOG}/policy/${COMPONENT}/stdout 2>&1 & RETVAL=$? RETVAL=$? } 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..a78dfc82e 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 @@ <!-- Access log processes all example. Documentation at: /docs/config/valve.html Note: The pattern used is equivalent to using pattern="common" --> - <Valve className="org.apache.catalina.valves.AccessLogValve" directory="logs" + <Valve className="org.apache.catalina.valves.AccessLogValve" directory="${{POLICY_LOGS}}/policy/catalina" prefix="localhost_access_log" suffix=".txt" pattern="%h %l %u %t "%r" %s %b" /> 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..ecbeb6e4d 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 @@ <!-- Access log processes all example. Documentation at: /docs/config/valve.html Note: The pattern used is equivalent to using pattern="common" --> - <Valve className="org.apache.catalina.valves.AccessLogValve" directory="logs" + <Valve className="org.apache.catalina.valves.AccessLogValve" directory="${{POLICY_LOGS}}/policy/catalina" prefix="localhost_access_log" suffix=".txt" pattern="%h %l %u %t "%r" %s %b" /> diff --git a/packages/base/src/files/install/servers/console/conf/logging.properties b/packages/base/src/files/install/servers/console/conf/logging.properties new file mode 100644 index 000000000..88e50c597 --- /dev/null +++ b/packages/base/src/files/install/servers/console/conf/logging.properties @@ -0,0 +1,65 @@ +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +handlers = 1catalina.org.apache.juli.AsyncFileHandler, 2localhost.org.apache.juli.AsyncFileHandler, 3manager.org.apache.juli.AsyncFileHandler, 4host-manager.org.apache.juli.AsyncFileHandler, java.util.logging.ConsoleHandler + +.handlers = 1catalina.org.apache.juli.AsyncFileHandler, java.util.logging.ConsoleHandler + +############################################################ +# Handler specific properties. +# Describes specific configuration info for Handlers. +############################################################ + +1catalina.org.apache.juli.AsyncFileHandler.level = FINE +1catalina.org.apache.juli.AsyncFileHandler.directory = /var/log/onap/policy/console +1catalina.org.apache.juli.AsyncFileHandler.prefix = catalina. + +2localhost.org.apache.juli.AsyncFileHandler.level = FINE +2localhost.org.apache.juli.AsyncFileHandler.directory = /var/log/onap/policy/console +2localhost.org.apache.juli.AsyncFileHandler.prefix = localhost. + +3manager.org.apache.juli.AsyncFileHandler.level = FINE +3manager.org.apache.juli.AsyncFileHandler.directory = /var/log/onap/policy/console +3manager.org.apache.juli.AsyncFileHandler.prefix = manager. + +4host-manager.org.apache.juli.AsyncFileHandler.level = FINE +4host-manager.org.apache.juli.AsyncFileHandler.directory = /var/log/onap/policy/console +4host-manager.org.apache.juli.AsyncFileHandler.prefix = host-manager. + +java.util.logging.ConsoleHandler.level = FINE +java.util.logging.ConsoleHandler.formatter = org.apache.juli.OneLineFormatter + + +############################################################ +# Facility specific properties. +# Provides extra control for each logger. +############################################################ + +org.apache.catalina.core.ContainerBase.[Catalina].[localhost].level = INFO +org.apache.catalina.core.ContainerBase.[Catalina].[localhost].handlers = 2localhost.org.apache.juli.AsyncFileHandler + +org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/manager].level = INFO +org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/manager].handlers = 3manager.org.apache.juli.AsyncFileHandler + +org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/host-manager].level = INFO +org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/host-manager].handlers = 4host-manager.org.apache.juli.AsyncFileHandler + +# For example, set the org.apache.catalina.util.LifecycleBase logger to log +# each component that extends LifecycleBase changing state: +#org.apache.catalina.util.LifecycleBase.level = FINE + +# To see debug messages in TldLocationsCache, uncomment the following line: +#org.apache.jasper.compiler.TldLocationsCache.level = FINE + 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..618a6a99a 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 @@ <!-- Access log processes all example. Documentation at: /docs/config/valve.html Note: The pattern used is equivalent to using pattern="common" --> - <Valve className="org.apache.catalina.valves.AccessLogValve" directory="logs" + <Valve className="org.apache.catalina.valves.AccessLogValve" directory="${{POLICY_LOGS}}/policy/catalina" prefix="localhost_access_log" suffix=".txt" pattern="%h %l %u %t "%r" %s %b" /> diff --git a/packages/base/src/files/install/servers/pap/conf/logging.properties b/packages/base/src/files/install/servers/pap/conf/logging.properties new file mode 100644 index 000000000..3d4d024f2 --- /dev/null +++ b/packages/base/src/files/install/servers/pap/conf/logging.properties @@ -0,0 +1,65 @@ +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +handlers = 1catalina.org.apache.juli.AsyncFileHandler, 2localhost.org.apache.juli.AsyncFileHandler, 3manager.org.apache.juli.AsyncFileHandler, 4host-manager.org.apache.juli.AsyncFileHandler, java.util.logging.ConsoleHandler + +.handlers = 1catalina.org.apache.juli.AsyncFileHandler, java.util.logging.ConsoleHandler + +############################################################ +# Handler specific properties. +# Describes specific configuration info for Handlers. +############################################################ + +1catalina.org.apache.juli.AsyncFileHandler.level = FINE +1catalina.org.apache.juli.AsyncFileHandler.directory = /var/log/onap/policy/pap +1catalina.org.apache.juli.AsyncFileHandler.prefix = catalina. + +2localhost.org.apache.juli.AsyncFileHandler.level = FINE +2localhost.org.apache.juli.AsyncFileHandler.directory = /var/log/onap/policy/pap +2localhost.org.apache.juli.AsyncFileHandler.prefix = localhost. + +3manager.org.apache.juli.AsyncFileHandler.level = FINE +3manager.org.apache.juli.AsyncFileHandler.directory = /var/log/onap/policy/pap +3manager.org.apache.juli.AsyncFileHandler.prefix = manager. + +4host-manager.org.apache.juli.AsyncFileHandler.level = FINE +4host-manager.org.apache.juli.AsyncFileHandler.directory = /var/log/onap/policy/pap +4host-manager.org.apache.juli.AsyncFileHandler.prefix = host-manager. + +java.util.logging.ConsoleHandler.level = FINE +java.util.logging.ConsoleHandler.formatter = org.apache.juli.OneLineFormatter + + +############################################################ +# Facility specific properties. +# Provides extra control for each logger. +############################################################ + +org.apache.catalina.core.ContainerBase.[Catalina].[localhost].level = INFO +org.apache.catalina.core.ContainerBase.[Catalina].[localhost].handlers = 2localhost.org.apache.juli.AsyncFileHandler + +org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/manager].level = INFO +org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/manager].handlers = 3manager.org.apache.juli.AsyncFileHandler + +org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/host-manager].level = INFO +org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/host-manager].handlers = 4host-manager.org.apache.juli.AsyncFileHandler + +# For example, set the org.apache.catalina.util.LifecycleBase logger to log +# each component that extends LifecycleBase changing state: +#org.apache.catalina.util.LifecycleBase.level = FINE + +# To see debug messages in TldLocationsCache, uncomment the following line: +#org.apache.jasper.compiler.TldLocationsCache.level = FINE + diff --git a/packages/base/src/files/install/servers/pdp/conf/logging.properties b/packages/base/src/files/install/servers/pdp/conf/logging.properties new file mode 100644 index 000000000..1f8e48dd2 --- /dev/null +++ b/packages/base/src/files/install/servers/pdp/conf/logging.properties @@ -0,0 +1,65 @@ +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +handlers = 1catalina.org.apache.juli.AsyncFileHandler, 2localhost.org.apache.juli.AsyncFileHandler, 3manager.org.apache.juli.AsyncFileHandler, 4host-manager.org.apache.juli.AsyncFileHandler, java.util.logging.ConsoleHandler + +.handlers = 1catalina.org.apache.juli.AsyncFileHandler, java.util.logging.ConsoleHandler + +############################################################ +# Handler specific properties. +# Describes specific configuration info for Handlers. +############################################################ + +1catalina.org.apache.juli.AsyncFileHandler.level = FINE +1catalina.org.apache.juli.AsyncFileHandler.directory = /var/log/onap/policy/pdp +1catalina.org.apache.juli.AsyncFileHandler.prefix = catalina. + +2localhost.org.apache.juli.AsyncFileHandler.level = FINE +2localhost.org.apache.juli.AsyncFileHandler.directory = /var/log/onap/policy/pdp +2localhost.org.apache.juli.AsyncFileHandler.prefix = localhost. + +3manager.org.apache.juli.AsyncFileHandler.level = FINE +3manager.org.apache.juli.AsyncFileHandler.directory = /var/log/onap/policy/pdp +3manager.org.apache.juli.AsyncFileHandler.prefix = manager. + +4host-manager.org.apache.juli.AsyncFileHandler.level = FINE +4host-manager.org.apache.juli.AsyncFileHandler.directory = /var/log/onap/policy/pdp +4host-manager.org.apache.juli.AsyncFileHandler.prefix = host-manager. + +java.util.logging.ConsoleHandler.level = FINE +java.util.logging.ConsoleHandler.formatter = org.apache.juli.OneLineFormatter + + +############################################################ +# Facility specific properties. +# Provides extra control for each logger. +############################################################ + +org.apache.catalina.core.ContainerBase.[Catalina].[localhost].level = INFO +org.apache.catalina.core.ContainerBase.[Catalina].[localhost].handlers = 2localhost.org.apache.juli.AsyncFileHandler + +org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/manager].level = INFO +org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/manager].handlers = 3manager.org.apache.juli.AsyncFileHandler + +org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/host-manager].level = INFO +org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/host-manager].handlers = 4host-manager.org.apache.juli.AsyncFileHandler + +# For example, set the org.apache.catalina.util.LifecycleBase logger to log +# each component that extends LifecycleBase changing state: +#org.apache.catalina.util.LifecycleBase.level = FINE + +# To see debug messages in TldLocationsCache, uncomment the following line: +#org.apache.jasper.compiler.TldLocationsCache.level = FINE + diff --git a/packages/docker/src/main/docker/docker-install.sh b/packages/docker/src/main/docker/docker-install.sh index e8b9aaf14..5c85611b1 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,11 @@ if [[ -z ${POLICY_GROUP} ]]; then exit 1 fi +if [[ -z ${POLICY_LOGS} ]]; then + echo "POLICY_LOGS environment variable NOT set, default to /var/log/onap" + 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/paplp.conf b/packages/install/src/files/paplp.conf index f5a6d096b..e4fc837d2 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 716326c56..9397e485b 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 |