diff --git a/core/src/main/java/oracle/weblogic/deploy/logging/WLSDeployLoggingConfig.java b/core/src/main/java/oracle/weblogic/deploy/logging/WLSDeployLoggingConfig.java index 5f96a03a8..23137f687 100644 --- a/core/src/main/java/oracle/weblogic/deploy/logging/WLSDeployLoggingConfig.java +++ b/core/src/main/java/oracle/weblogic/deploy/logging/WLSDeployLoggingConfig.java @@ -156,7 +156,6 @@ public WLSDeployLoggingConfig() { System.exit(ERROR_EXIT_CODE); } PlatformLogger logger = WLSDeployLogFactory.getLogger(WLSDEPLOY_LOGGER_NAME); // make sure that this is the first logger - logger.info("The {0} program will write its log to {1}", programName, logFileName); } /** @@ -168,6 +167,15 @@ public static synchronized File getLoggingDirectory() { return new File(loggingDirectory.getAbsolutePath()); } + /** + * Log the logging directory path + * + */ + public static void logLoggingDirectory(String programName) { + PlatformLogger logger = WLSDeployLogFactory.getLogger(WLSDEPLOY_LOGGER_NAME); + logger.info("WLSDPLY-01755", programName, loggingDirectory.getAbsolutePath()); + } + /** * Get the logging.properties file. * diff --git a/core/src/main/python/create.py b/core/src/main/python/create.py index 2e52b3452..8fb630ce6 100644 --- a/core/src/main/python/create.py +++ b/core/src/main/python/create.py @@ -14,6 +14,7 @@ from java.lang import System from oracle.weblogic.deploy.create import CreateException from oracle.weblogic.deploy.deploy import DeployException +from oracle.weblogic.deploy.logging import WLSDeployLoggingConfig from oracle.weblogic.deploy.util import CLAException from oracle.weblogic.deploy.util import FileUtils from oracle.weblogic.deploy.util import WLSDeployArchiveIOException @@ -379,6 +380,7 @@ def main(args): if __name__ == '__main__' or __name__ == 'main': WebLogicDeployToolingVersion.logVersionInfo(_program_name) + WLSDeployLoggingConfig.logLoggingDirectory(_program_name) try: main(sys.argv) except exceptions.SystemExit, ex: diff --git a/core/src/main/python/deploy.py b/core/src/main/python/deploy.py index b8774b20c..f313f1688 100644 --- a/core/src/main/python/deploy.py +++ b/core/src/main/python/deploy.py @@ -10,6 +10,7 @@ from oracle.weblogic.deploy.deploy import DeployException from oracle.weblogic.deploy.exception import BundleAwareException +from oracle.weblogic.deploy.logging import WLSDeployLoggingConfig from oracle.weblogic.deploy.util import CLAException from oracle.weblogic.deploy.util import WebLogicDeployToolingVersion @@ -261,6 +262,7 @@ def main(args): if __name__ == '__main__' or __name__ == 'main': WebLogicDeployToolingVersion.logVersionInfo(_program_name) + WLSDeployLoggingConfig.logLoggingDirectory(_program_name) try: main(sys.argv) except exceptions.SystemExit, ex: diff --git a/core/src/main/python/discover.py b/core/src/main/python/discover.py index ba8ec932d..f25f160ef 100644 --- a/core/src/main/python/discover.py +++ b/core/src/main/python/discover.py @@ -15,6 +15,7 @@ from oracle.weblogic.deploy.aliases import AliasException from oracle.weblogic.deploy.discover import DiscoverException from oracle.weblogic.deploy.json import JsonException +from oracle.weblogic.deploy.logging import WLSDeployLoggingConfig from oracle.weblogic.deploy.util import CLAException from oracle.weblogic.deploy.util import FileUtils from oracle.weblogic.deploy.util import PyOrderedDict @@ -641,6 +642,7 @@ def main(args): if __name__ == '__main__' or __name__ == 'main': WebLogicDeployToolingVersion.logVersionInfo(_program_name) + WLSDeployLoggingConfig.logLoggingDirectory(_program_name) try: main(sys.argv) except exceptions.SystemExit, ex: diff --git a/core/src/main/python/encrypt.py b/core/src/main/python/encrypt.py index 443336593..9382dd995 100644 --- a/core/src/main/python/encrypt.py +++ b/core/src/main/python/encrypt.py @@ -11,6 +11,7 @@ from java.lang import String, System from oracle.weblogic.deploy.encrypt import EncryptionException +from oracle.weblogic.deploy.logging import WLSDeployLoggingConfig from oracle.weblogic.deploy.util import CLAException from oracle.weblogic.deploy.util import TranslateException from oracle.weblogic.deploy.util import VariableException @@ -255,6 +256,7 @@ def main(args): if __name__ == '__main__' or __name__ == 'main': WebLogicDeployToolingVersion.logVersionInfo(_program_name) + WLSDeployLoggingConfig.logLoggingDirectory(_program_name) try: main(sys.argv) except exceptions.SystemExit, ex: diff --git a/core/src/main/python/extract_resource.py b/core/src/main/python/extract_resource.py index 23f3318ee..b0b3f1303 100644 --- a/core/src/main/python/extract_resource.py +++ b/core/src/main/python/extract_resource.py @@ -8,6 +8,7 @@ import sys from oracle.weblogic.deploy.deploy import DeployException +from oracle.weblogic.deploy.logging import WLSDeployLoggingConfig from oracle.weblogic.deploy.util import CLAException from oracle.weblogic.deploy.util import WebLogicDeployToolingVersion @@ -160,6 +161,7 @@ def main(args): if __name__ == '__main__' or __name__ == 'main': WebLogicDeployToolingVersion.logVersionInfo(_program_name) + WLSDeployLoggingConfig.logLoggingDirectory(_program_name) try: main(sys.argv) except exceptions.SystemExit, ex: diff --git a/core/src/main/python/model_help.py b/core/src/main/python/model_help.py index 4a022441d..30768987d 100644 --- a/core/src/main/python/model_help.py +++ b/core/src/main/python/model_help.py @@ -8,6 +8,7 @@ import os import sys +from oracle.weblogic.deploy.logging import WLSDeployLoggingConfig from oracle.weblogic.deploy.util import CLAException from oracle.weblogic.deploy.util import WebLogicDeployToolingVersion @@ -451,6 +452,7 @@ def main(args): if __name__ == '__main__' or __name__ == 'main': WebLogicDeployToolingVersion.logVersionInfo(_program_name) + WLSDeployLoggingConfig.logLoggingDirectory(_program_name) try: main(sys.argv) except exceptions.SystemExit, ex: diff --git a/core/src/main/python/prepare_model.py b/core/src/main/python/prepare_model.py index e926b9f9a..4fb77018b 100644 --- a/core/src/main/python/prepare_model.py +++ b/core/src/main/python/prepare_model.py @@ -11,6 +11,7 @@ import sys import traceback +from oracle.weblogic.deploy.logging import WLSDeployLoggingConfig from oracle.weblogic.deploy.util import CLAException from oracle.weblogic.deploy.util import PyWLSTException from oracle.weblogic.deploy.util import WebLogicDeployToolingVersion @@ -111,6 +112,7 @@ def main(): if __name__ == "__main__" or __name__ == 'main': WebLogicDeployToolingVersion.logVersionInfo(_program_name) + WLSDeployLoggingConfig.logLoggingDirectory(_program_name) try: main() except exceptions.SystemExit, ex: diff --git a/core/src/main/python/update.py b/core/src/main/python/update.py index 61befe83b..c74bdedd7 100644 --- a/core/src/main/python/update.py +++ b/core/src/main/python/update.py @@ -9,6 +9,7 @@ import sys from oracle.weblogic.deploy.deploy import DeployException +from oracle.weblogic.deploy.logging import WLSDeployLoggingConfig from oracle.weblogic.deploy.exception import BundleAwareException from oracle.weblogic.deploy.util import CLAException from oracle.weblogic.deploy.util import WebLogicDeployToolingVersion @@ -311,6 +312,7 @@ def main(args): if __name__ == '__main__' or __name__ == 'main': WebLogicDeployToolingVersion.logVersionInfo(_program_name) + WLSDeployLoggingConfig.logLoggingDirectory(_program_name) try: main(sys.argv) except exceptions.SystemExit, ex: diff --git a/core/src/main/python/validate.py b/core/src/main/python/validate.py index ee63ff78b..68abd80f3 100644 --- a/core/src/main/python/validate.py +++ b/core/src/main/python/validate.py @@ -12,6 +12,7 @@ from java.util.logging import Level from oracle.weblogic.deploy.logging import WLSDeployLogEndHandler +from oracle.weblogic.deploy.logging import WLSDeployLoggingConfig from oracle.weblogic.deploy.util import CLAException from oracle.weblogic.deploy.util import TranslateException from oracle.weblogic.deploy.util import VariableException diff --git a/core/src/main/python/variable_inject.py b/core/src/main/python/variable_inject.py index ccc99dd09..3fb54159c 100644 --- a/core/src/main/python/variable_inject.py +++ b/core/src/main/python/variable_inject.py @@ -9,6 +9,7 @@ from java.io import File from java.lang import IllegalArgumentException +from oracle.weblogic.deploy.logging import WLSDeployLoggingConfig from oracle.weblogic.deploy.util import CLAException from oracle.weblogic.deploy.util import FileUtils from oracle.weblogic.deploy.util import TranslateException @@ -206,6 +207,7 @@ def main(args): if __name__ == '__main__' or __name__ == 'main': WebLogicDeployToolingVersion.logVersionInfo(_program_name) + WLSDeployLoggingConfig.logLoggingDirectory(_program_name) try: main(sys.argv) except exceptions.SystemExit, ex: diff --git a/core/src/main/resources/oracle/weblogic/deploy/messages/wlsdeploy_rb.properties b/core/src/main/resources/oracle/weblogic/deploy/messages/wlsdeploy_rb.properties index f8cb2e842..88279c6e0 100644 --- a/core/src/main/resources/oracle/weblogic/deploy/messages/wlsdeploy_rb.properties +++ b/core/src/main/resources/oracle/weblogic/deploy/messages/wlsdeploy_rb.properties @@ -361,6 +361,9 @@ WLSDPLY-01746=Invalid token syntax for {0} value "{1}", should match "{2}" # oracle.weblogic.deploy.util.WebLogicDeployToolingVersion.java (in src/main/resources/templates) WLSDPLY-01750=The WebLogic Deploy Tooling {0} version is {1} +# oracle.weblogic.deploy.logging.WLSDeployLoggingConfig.java +WLSDPLY-01755=The {0} program will write its log to directory {1} + # logger_test.py WLSDPLY-01760=Failed to access key in map: {0}