From 6eb3c7f44a64cc1aebd4bcef6b081073d91bde7b Mon Sep 17 00:00:00 2001 From: Jim Hahn Date: Tue, 12 Jun 2018 14:35:01 -0400 Subject: [PATCH] Use POLICY_LOGS env variable in logging.properties Some logger.properties have /var/log/onap hard-coded; changed those to use $POLICY_LOGS. Other logger.properties had ${POLICY_LOGS} instead of ${{POLICY_LOGS}}; fixed those, too. Change-Id: I56faf5982abf520ee364b54a3560313d0f15cc2a Issue-ID: POLICY-784 Signed-off-by: Jim Hahn --- ONAP-PDP/logging.properties | 4 ++-- .../src/files/install/servers/console/conf/logging.properties | 11 +++++++---- .../src/files/install/servers/pap/conf/logging.properties | 11 +++++++---- .../src/files/install/servers/pdp/conf/logging.properties | 11 +++++++---- 4 files changed, 23 insertions(+), 14 deletions(-) diff --git a/ONAP-PDP/logging.properties b/ONAP-PDP/logging.properties index 900d3ad3e..e88d3726f 100644 --- a/ONAP-PDP/logging.properties +++ b/ONAP-PDP/logging.properties @@ -2,7 +2,7 @@ # ============LICENSE_START======================================================= # ONAP-PDP # ================================================================================ -# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. +# Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved. # ================================================================================ # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -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=${POLICY_LOGS}/policy/pdpx/%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/packages/base/src/files/install/servers/console/conf/logging.properties b/packages/base/src/files/install/servers/console/conf/logging.properties index 88e50c597..e0cd49b7c 100644 --- a/packages/base/src/files/install/servers/console/conf/logging.properties +++ b/packages/base/src/files/install/servers/console/conf/logging.properties @@ -1,3 +1,6 @@ +# +# Copyright (C) 2018 AT&T Intellectual Property. All rights reserved. +# # 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. @@ -23,19 +26,19 @@ handlers = 1catalina.org.apache.juli.AsyncFileHandler, 2localhost.org.apache.jul ############################################################ 1catalina.org.apache.juli.AsyncFileHandler.level = FINE -1catalina.org.apache.juli.AsyncFileHandler.directory = /var/log/onap/policy/console +1catalina.org.apache.juli.AsyncFileHandler.directory = ${{POLICY_LOGS}}/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.directory = ${{POLICY_LOGS}}/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.directory = ${{POLICY_LOGS}}/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.directory = ${{POLICY_LOGS}}/policy/console 4host-manager.org.apache.juli.AsyncFileHandler.prefix = host-manager. java.util.logging.ConsoleHandler.level = FINE diff --git a/packages/base/src/files/install/servers/pap/conf/logging.properties b/packages/base/src/files/install/servers/pap/conf/logging.properties index 3d4d024f2..4f74472c5 100644 --- a/packages/base/src/files/install/servers/pap/conf/logging.properties +++ b/packages/base/src/files/install/servers/pap/conf/logging.properties @@ -1,3 +1,6 @@ +# +# Copyright (C) 2018 AT&T Intellectual Property. All rights reserved. +# # 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. @@ -23,19 +26,19 @@ handlers = 1catalina.org.apache.juli.AsyncFileHandler, 2localhost.org.apache.jul ############################################################ 1catalina.org.apache.juli.AsyncFileHandler.level = FINE -1catalina.org.apache.juli.AsyncFileHandler.directory = /var/log/onap/policy/pap +1catalina.org.apache.juli.AsyncFileHandler.directory = ${{POLICY_LOGS}}/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.directory = ${{POLICY_LOGS}}/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.directory = ${{POLICY_LOGS}}/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.directory = ${{POLICY_LOGS}}/policy/pap 4host-manager.org.apache.juli.AsyncFileHandler.prefix = host-manager. java.util.logging.ConsoleHandler.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 index 1f8e48dd2..9474f98a7 100644 --- a/packages/base/src/files/install/servers/pdp/conf/logging.properties +++ b/packages/base/src/files/install/servers/pdp/conf/logging.properties @@ -1,3 +1,6 @@ +# +# Copyright (C) 2018 AT&T Intellectual Property. All rights reserved. +# # 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. @@ -23,19 +26,19 @@ handlers = 1catalina.org.apache.juli.AsyncFileHandler, 2localhost.org.apache.jul ############################################################ 1catalina.org.apache.juli.AsyncFileHandler.level = FINE -1catalina.org.apache.juli.AsyncFileHandler.directory = /var/log/onap/policy/pdp +1catalina.org.apache.juli.AsyncFileHandler.directory = ${{POLICY_LOGS}}/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.directory = ${{POLICY_LOGS}}/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.directory = ${{POLICY_LOGS}}/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.directory = ${{POLICY_LOGS}}/policy/pdp 4host-manager.org.apache.juli.AsyncFileHandler.prefix = host-manager. java.util.logging.ConsoleHandler.level = FINE -- 2.16.6