Skip to content

Commit c77b00a

Browse files
committed
Issue #287 - Fix log summary in createDomain
1 parent e0c69d4 commit c77b00a

File tree

3 files changed

+17
-3
lines changed

3 files changed

+17
-3
lines changed

core/src/main/python/create.py

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -366,7 +366,7 @@ def validateRCUArgsAndModel(model_context, model):
366366
if model_context.get_domain_typedef().required_rcu():
367367
if not model_context.get_rcu_database() or not model_context.get_rcu_prefix():
368368
__logger.severe('WLSDPLY-12408', model_context.get_domain_type(), CommandLineArgUtil.RCU_DB_SWITCH,
369-
CommandLineArgUtil.RCU_PREFIX_SWITCH)
369+
CommandLineArgUtil.RCU_PREFIX_SWITCH)
370370
__clean_up_temp_files()
371371
tool_exit.end(model_context, CommandLineArgUtil.PROG_ERROR_EXIT_CODE)
372372

@@ -388,6 +388,8 @@ def main(args):
388388

389389
wlst_helper.silence()
390390

391+
exit_code = CommandLineArgUtil.PROG_OK_EXIT_CODE
392+
391393
try:
392394
model_context = __process_args(args)
393395
except CLAException, ex:
@@ -450,8 +452,11 @@ def main(args):
450452
tool_exit.end(model_context, CommandLineArgUtil.PROG_ERROR_EXIT_CODE)
451453

452454
__clean_up_temp_files()
455+
456+
tool_exit.end(model_context, exit_code)
453457
return
454458

459+
455460
if __name__ == "main":
456461
WebLogicDeployToolingVersion.logVersionInfo(_program_name)
457462
main(sys.argv)

installer/src/main/bin/createDomain.cmd

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -271,7 +271,8 @@ IF NOT EXIST "%WLST%" (
271271
)
272272
:found_wlst
273273

274-
SET LOG_CONFIG_CLASS=oracle.weblogic.deploy.logging.WLSDeployLoggingConfig
274+
SET LOG_CONFIG_CLASS=oracle.weblogic.deploy.logging.WLSDeployCustomizeLoggingConfig
275+
SET WLSDEPLOY_LOG_HANDLER=oracle.weblogic.deploy.logging.SummaryHandler
275276
SET WLST_PROPERTIES=-Dcom.oracle.cie.script.throwException=true
276277
SET "WLST_PROPERTIES=-Djava.util.logging.config.class=%LOG_CONFIG_CLASS% %WLST_PROPERTIES%"
277278
SET "WLST_PROPERTIES=%WLST_PROPERTIES% %WLSDEPLOY_PROPERTIES%"
@@ -282,6 +283,9 @@ IF NOT DEFINED WLSDEPLOY_LOG_PROPERTIES (
282283
IF NOT DEFINED WLSDEPLOY_LOG_DIRECTORY (
283284
SET WLSDEPLOY_LOG_DIRECTORY=%WLSDEPLOY_HOME%\logs
284285
)
286+
IF NOT DEFINED WLSDEPLOY_LOG_HANDLERS (
287+
SET WLSDEPLOY_LOG_HANDLERS=%WLSDEPLOY_LOG_HANDLER%
288+
)
285289

286290
ECHO JAVA_HOME = %JAVA_HOME%
287291
ECHO WLST_EXT_CLASSPATH = %WLST_EXT_CLASSPATH%

installer/src/main/bin/createDomain.sh

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -295,7 +295,8 @@ else
295295
fi
296296
fi
297297

298-
LOG_CONFIG_CLASS=oracle.weblogic.deploy.logging.WLSDeployLoggingConfig
298+
LOG_CONFIG_CLASS=oracle.weblogic.deploy.logging.WLSDeployCustomizeLoggingConfig
299+
WLSDEPLOY_LOG_HANDLER=oracle.weblogic.deploy.logging.SummaryHandler
299300
WLST_PROPERTIES=-Dcom.oracle.cie.script.throwException=true
300301
WLST_PROPERTIES="-Djava.util.logging.config.class=${LOG_CONFIG_CLASS} ${WLST_PROPERTIES} ${WLSDEPLOY_PROPERTIES}"
301302
export WLST_PROPERTIES
@@ -308,6 +309,10 @@ if [ "${WLSDEPLOY_LOG_DIRECTORY}" = "" ]; then
308309
WLSDEPLOY_LOG_DIRECTORY=${WLSDEPLOY_HOME}/logs; export WLSDEPLOY_LOG_DIRECTORY
309310
fi
310311

312+
if [ "${WLSDEPLOY_LOG_HANDLERS}" == "" ]; then
313+
WLSDEPLOY_LOG_HANDLERS=${WLSDEPLOY_LOG_HANDLER}; export WLSDEPLOY_LOG_HANDLERS
314+
fi
315+
311316
echo "JAVA_HOME = ${JAVA_HOME}"
312317
echo "WLST_EXT_CLASSPATH = ${WLST_EXT_CLASSPATH}"
313318
echo "CLASSPATH = ${CLASSPATH}"

0 commit comments

Comments
 (0)