Merge branch 'wdt-902' into 'main'

Fixing tools to detect when logging is not properly configured See merge request weblogic-cloud/weblogic-deploy-tooling!1712
oracle · Jun 20, 2024 · cefaa8b · cefaa8b
2 parents ba67a98 + 0fd0e70
commit cefaa8b
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 3 deletions.
diff --git a/core/src/main/python/wlsdeploy/util/tool_main.py b/core/src/main/python/wlsdeploy/util/tool_main.py
@@ -16,6 +16,7 @@
 from oracle.weblogic.deploy.logging import WLSDeployLoggingConfig
 from oracle.weblogic.deploy.logging import WLSDeployLogEndHandler
 from oracle.weblogic.deploy.util import CLAException
+from oracle.weblogic.deploy.util import ExitCode
 from oracle.weblogic.deploy.util import WebLogicDeployToolingVersion
 from oracle.weblogic.deploy.util import WLSDeployExit
 from oracle.weblogic.deploy.util import WLSDeployContext
@@ -36,6 +37,8 @@
 _os_arch = JSystem.getProperty('os.arch')
 _os_version = JSystem.getProperty('os.version')
 
+_wdt_log_config_class_name = 'oracle.weblogic.deploy.logging.WLSDeployLoggingConfig'
+
 def run_tool(main, process_args, args, program_name, class_name, logger):
     """
     The standardized entry point into each tool.
@@ -49,6 +52,8 @@ def run_tool(main, process_args, args, program_name, class_name, logger):
     """
     _method_name = 'main'
 
+    __assertWebLogicDeployToolingLoggingIsConfigured(program_name)
+
     WebLogicDeployToolingVersion.logVersionInfo(program_name)
     WLSDeployLoggingConfig.logLoggingDirectory(program_name)
     logger.info('WLSDPLY-20043', args[0], _java_version, __format_os_version(),
@@ -87,6 +92,22 @@ def run_tool(main, process_args, args, program_name, class_name, logger):
     cla_helper.clean_up_temp_files()
     __exit_tool(model_context_obj, exit_code)
 
+def __assertWebLogicDeployToolingLoggingIsConfigured(program_name):
+    log_config_class_name = JSystem.getProperty('java.util.logging.config.class')
+
+    err_message = None
+    if log_config_class_name is None:
+        err_message = 'The WebLogic Deploy Tooling logging configuration class was not defined...%s will exit' \
+                      % program_name
+    elif str_helper.to_string(log_config_class_name) != _wdt_log_config_class_name:
+        err_message = 'The WebLogic Deploy Tooling logging configuration class was overridden with %s...%s will exit' \
+                      % (log_config_class_name, program_name)
+
+    if err_message is not None:
+        JSystem.err.println(err_message)
+        JSystem.exit(ExitCode.ERROR)
+
+
 def __format_os_version():
     return '%s %s (%s)' % (_os_name, _os_version, _os_arch)
 

diff --git a/installer/src/main/bin/discoverDomain.sh b/installer/src/main/bin/discoverDomain.sh
@@ -50,11 +50,11 @@ usage() {
   echo "           -ssh_private_key_pass_env <ssh_private_key_pass_env> | -ssh_private_key_pass_file <ssh_private_key_pass_file> | -ssh_private_key_pass_prompt"
   echo "          ]"
   echo "          [ -discover_passwords"
-   echo "            -passphrase_env <passphrase_env> | -passphrase_file <passphrase_file> | -passphrase_prompt"
-   echo "          ]"
+  echo "            -passphrase_env <passphrase_env> | -passphrase_file <passphrase_file> | -passphrase_prompt"
+  echo "          ]"
   echo "          [ -discover_security_provider_data <discover_security_provider_scope>"
   echo "            -passphrase_env <passphrase_env> | -passphrase_file <passphrase_file> | -passphrase_prompt"
-   echo "          ]"
+  echo "          ]"
   echo "          [ -discover_opss_wallet"
   echo "            [-opss_wallet_passphrase_env <opss_wallet_passphrase_env> | -opss_wallet_passphrase_file <opss_wallet_passphrase_file>]"
   echo "            -passphrase_env <passphrase_env> | -passphrase_file <passphrase_file> | -passphrase_prompt"