aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--BRMSGateway/src/main/resources/log4j.properties2
-rw-r--r--BRMSGateway/src/main/resources/logback.xml8
-rw-r--r--ONAP-PAP-REST/src/main/resources/log4j.properties6
-rw-r--r--ONAP-PAP-REST/src/main/resources/logback.xml12
-rw-r--r--ONAP-PDP-REST/src/main/resources/log4j.properties6
-rw-r--r--ONAP-PDP-REST/src/main/resources/logback.xml12
-rw-r--r--ONAP-PDP/logging.properties2
-rw-r--r--ONAP-SDK-APP/src/main/resources/logback.xml11
-rw-r--r--PolicyEngineAPI/src/main/resources/log4j.properties14
-rw-r--r--PolicyEngineAPI/src/main/resources/logback.xml8
-rw-r--r--packages/base/src/files/etc/profile.d/env.sh1
-rw-r--r--packages/base/src/files/install/mysql/bin/cleanup_policy.sh11
-rw-r--r--packages/base/src/files/install/mysql/bin/db_backup.sh11
-rw-r--r--packages/base/src/files/install/mysql/bin/db_backup_data.sh11
-rw-r--r--packages/base/src/files/install/mysql/bin/db_backup_remote.sh9
-rw-r--r--packages/base/src/files/install/mysql/bin/db_restore.sh18
-rw-r--r--packages/base/src/files/install/mysql/bin/db_restore_data.sh7
-rw-r--r--packages/base/src/files/install/mysql/bin/db_upgrade.sh8
-rw-r--r--packages/base/src/files/install/mysql/bin/db_upgrade_remote.sh8
-rw-r--r--packages/base/src/files/install/servers/brmsgw/init.d/brmsgw2
-rwxr-xr-xpackages/base/src/files/install/servers/common/logparser/init.d/logparserd2
-rw-r--r--packages/base/src/files/install/servers/common/tomcat/conf/server.xml2
-rw-r--r--packages/base/src/files/install/servers/configs/conf/server.xml2
-rw-r--r--packages/base/src/files/install/servers/console/conf/logging.properties65
-rw-r--r--packages/base/src/files/install/servers/console/conf/server.xml2
-rw-r--r--packages/base/src/files/install/servers/pap/conf/logging.properties65
-rw-r--r--packages/base/src/files/install/servers/pdp/conf/logging.properties65
-rw-r--r--packages/docker/src/main/docker/docker-install.sh6
-rwxr-xr-xpackages/install/src/files/paplp.conf4
-rwxr-xr-xpackages/install/src/files/pdplp.conf4
30 files changed, 312 insertions, 72 deletions
diff --git a/BRMSGateway/src/main/resources/log4j.properties b/BRMSGateway/src/main/resources/log4j.properties
index 9ec89ea0a..8be1ea141 100644
--- a/BRMSGateway/src/main/resources/log4j.properties
+++ b/BRMSGateway/src/main/resources/log4j.properties
@@ -29,7 +29,7 @@ log4j.rootLogger=INFO, FILE
log4j.appender.FILE=org.apache.log4j.DailyRollingFileAppender
# Set the name of the file
-log4j.appender.FILE.File=BRMSLog.log
+log4j.appender.FILE.File=${POLICY_LOGS}/policy/brmsgw/BRMSLog.log
# Set the immediate flush to true (default)
log4j.appender.FILE.ImmediateFlush=true
diff --git a/BRMSGateway/src/main/resources/logback.xml b/BRMSGateway/src/main/resources/logback.xml
index c01117ba7..2d592c0e2 100644
--- a/BRMSGateway/src/main/resources/logback.xml
+++ b/BRMSGateway/src/main/resources/logback.xml
@@ -21,15 +21,15 @@
<configuration scan="true" scanPeriod="3 seconds" debug="true">
<!--<jmxConfigurator /> -->
<!-- directory path for all other type logs -->
- <property name="logDir" value="logs" />
+ <property name="logDir" value="${POLICY_LOGS}" />
<!-- directory path for debugging type logs -->
- <property name="debugDir" value="logs" />
+ <property name="debugDir" value="${POLICY_LOGS}" />
<!-- specify the component name
<ONAP-component-name>::= "MSO" | "DCAE" | "ASDC " | "AAI" |"Policy" | "SDNC" | "AC" -->
- <property name="componentName" value="Policy"></property>
- <property name="subComponentName" value="BRMSGateway"></property>
+ <property name="componentName" value="policy"></property>
+ <property name="subComponentName" value="brmsgw"></property>
<!-- log file names -->
<property name="errorLogName" value="error" />
diff --git a/ONAP-PAP-REST/src/main/resources/log4j.properties b/ONAP-PAP-REST/src/main/resources/log4j.properties
index 04f3233c1..d728f2d40 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..24afa5538 100644
--- a/ONAP-PAP-REST/src/main/resources/logback.xml
+++ b/ONAP-PAP-REST/src/main/resources/logback.xml
@@ -21,15 +21,15 @@
<configuration scan="true" scanPeriod="3 seconds" debug="true">
<!--<jmxConfigurator /> -->
<!-- directory path for all other type logs -->
- <property name="logDir" value="logs" />
+ <property name="logDir" value="${POLICY_LOGS}" />
<!-- directory path for debugging type logs -->
- <property name="debugDir" value="logs" />
+ <property name="debugDir" value="${POLICY_LOGS}" />
<!-- specify the component name
<ONAP-component-name>::= "MSO" | "DCAE" | "ASDC " | "AAI" |"Policy" | "SDNC" | "AC" -->
- <property name="componentName" value="Policy"></property>
- <property name="subComponentName" value="ONAP-PAP-REST"></property>
+ <property name="componentName" value="policy"></property>
+ <property name="subComponentName" value="pap"></property>
<!-- log file names -->
<property name="errorLogName" value="error" />
@@ -84,8 +84,8 @@
<property name="debugLogDirectory" value="${debugDir}/${componentName}/${subComponentName}" />
-->
- <property name="logDirectory" value="${catalina.base}/${logDir}/${componentName}/${subComponentName}" />
- <property name="debugLogDirectory" value="${catalina.base}/${debugDir}/${componentName}/${subComponentName}" />
+ <property name="logDirectory" value="${logDir}/${componentName}/${subComponentName}" />
+ <property name="debugLogDirectory" value="${debugDir}/${componentName}/${subComponentName}" />
diff --git a/ONAP-PDP-REST/src/main/resources/log4j.properties b/ONAP-PDP-REST/src/main/resources/log4j.properties
index 6e5cfac93..925d2ea84 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..abcebff3f 100644
--- a/ONAP-PDP-REST/src/main/resources/logback.xml
+++ b/ONAP-PDP-REST/src/main/resources/logback.xml
@@ -21,15 +21,15 @@
<configuration scan="true" scanPeriod="3 seconds" debug="true">
<!--<jmxConfigurator /> -->
<!-- directory path for all other type logs -->
- <property name="logDir" value="logs" />
+ <property name="logDir" value="${POLICY_LOGS}" />
<!-- directory path for debugging type logs -->
- <property name="debugDir" value="logs" />
+ <property name="debugDir" value="${POLICY_LOGS}" />
<!-- specify the component name
<ONAP-component-name>::= "MSO" | "DCAE" | "ASDC " | "AAI" |"Policy" | "SDNC" | "AC" -->
- <property name="componentName" value="Policy"></property>
- <property name="subComponentName" value="ONAP-PDP-REST"></property>
+ <property name="componentName" value="policy"></property>
+ <property name="subComponentName" value="pdpx"></property>
<!-- log file names -->
<property name="errorLogName" value="error" />
@@ -83,8 +83,8 @@
<property name="debugLogDirectory" value="${debugDir}/${componentName}/${subComponentName}" />
-->
- <property name="logDirectory" value="${catalina.base}/${logDir}/${componentName}/${subComponentName}" />
- <property name="debugLogDirectory" value="${catalina.base}/${debugDir}/${componentName}/${subComponentName}" />
+ <property name="logDirectory" value="${logDir}/${componentName}/${subComponentName}" />
+ <property name="debugLogDirectory" value="${debugDir}/${componentName}/${subComponentName}" />
diff --git a/ONAP-PDP/logging.properties b/ONAP-PDP/logging.properties
index d25697ea8..900d3ad3e 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/%h/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..134ecb8ab 100644
--- a/ONAP-SDK-APP/src/main/resources/logback.xml
+++ b/ONAP-SDK-APP/src/main/resources/logback.xml
@@ -28,15 +28,16 @@
<!--<jmxConfigurator /> -->
<!-- specify the component name -->
- <property name="componentName" value="epsdk_app_os"></property>
+ <property name="componentName" value="policy"></property>
+ <property name="subComponentName" value="console"></property>
<!-- specify the base path of the log directory -->
- <property name="logDirPrefix" value="${catalina.base}/logs"></property>
+ <property name="logDirPrefix" value="${POLICY_LOGS}"></property>
<!-- The directories where logs are written -->
- <property name="logDirectory" value="${logDirPrefix}/${componentName}" />
+ <property name="logDirectory" value="${logDirPrefix}/${componentName}/${subComponentName}" />
<!-- Can easily relocate debug logs by modifying this path. -->
- <property name="debugLogDirectory" value="${logDirPrefix}/${componentName}" />
+ <property name="debugLogDirectory" value="${logDirPrefix}/${componentName}/${subComponentName}" />
<!-- log file names -->
<property name="generalLogName" value="application" />
@@ -234,4 +235,4 @@
<appender-ref ref="asyncEELF" />
</root>
-</configuration>
+</configuration> \ No newline at end of file
diff --git a/PolicyEngineAPI/src/main/resources/log4j.properties b/PolicyEngineAPI/src/main/resources/log4j.properties
index 83a68a767..d6787bd27 100644
--- a/PolicyEngineAPI/src/main/resources/log4j.properties
+++ b/PolicyEngineAPI/src/main/resources/log4j.properties
@@ -29,7 +29,7 @@ log4j.rootLogger=INFO, FILE
log4j.appender.FILE=org.apache.log4j.DailyRollingFileAppender
# Set the name of the file
-log4j.appender.FILE.File=policyEngineLog.log
+log4j.appender.FILE.File=${POLICY_LOGS}/policy/engineapi/policyEngineLog.log
# Set the immediate flush to true (default)
log4j.appender.FILE.ImmediateFlush=true
@@ -48,9 +48,9 @@ log4j.appender.FILE.layout=org.apache.log4j.PatternLayout
log4j.appender.FILE.layout.ConversionPattern=%d{yyyy_MM_dd_HH_mm_ss_SSS} [%t] %-5p %l- %m%n
# For AstraGW feature.
-log4j.appender.astra=org.apache.log4j.FileAppender
-log4j.appender.astra.File=astragw.log
-log4j.appender.astra.layout=org.apache.log4j.PatternLayout
-log4j.appender.astra.layout.ConversionPattern=%d{yyyy_MM_dd_HH_mm_ss_SSS} [%t] %-5p %l- %m%n
-log4j.category.astraLogger=TRACE, astra
-log4j.additivity.astraLogger=false
+#log4j.appender.astra=org.apache.log4j.FileAppender
+#log4j.appender.astra.File=${POLICY_LOGS}/policy/astragw/astragw.log
+#log4j.appender.astra.layout=org.apache.log4j.PatternLayout
+#log4j.appender.astra.layout.ConversionPattern=%d{yyyy_MM_dd_HH_mm_ss_SSS} [%t] %-5p %l- %m%n
+#log4j.category.astraLogger=TRACE, astra
+#log4j.additivity.astraLogger=false
diff --git a/PolicyEngineAPI/src/main/resources/logback.xml b/PolicyEngineAPI/src/main/resources/logback.xml
index 347466bcc..37261edd7 100644
--- a/PolicyEngineAPI/src/main/resources/logback.xml
+++ b/PolicyEngineAPI/src/main/resources/logback.xml
@@ -21,15 +21,15 @@
<configuration scan="true" scanPeriod="3 seconds" debug="true">
<!--<jmxConfigurator /> -->
<!-- directory path for all other type logs -->
- <property name="logDir" value="logs" />
+ <property name="logDir" value="${POLICY_LOGS}" />
<!-- directory path for debugging type logs -->
- <property name="debugDir" value="logs" />
+ <property name="debugDir" value="${POLICY_LOGS}" />
<!-- specify the component name
<ONAP-component-name>::= "MSO" | "DCAE" | "ASDC " | "AAI" |"Policy" | "SDNC" | "AC" -->
- <property name="componentName" value="Policy"></property>
- <property name="subComponentName" value="PolicyEngineAPI"></property>
+ <property name="componentName" value="policy"></property>
+ <property name="subComponentName" value="policyapi"></property>
<!-- log file names -->
<property name="errorLogName" value="error" />
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 &quot;%r&quot; %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 &quot;%r&quot; %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 &quot;%r&quot; %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 cd3e1f09b..1dd57ab36 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