Skip to content

Commit 72f1f5b

Browse files
jwgishjwgish
authored
WDT-644 write log file path to tool startup stdout logs (#1165)
* JIRA WDT-638 - Should never exit with uncaught exceptions * JIRA WDT-638 - simplify handling of uncaught exceptions * JIRA WDT-638 - remove unnecessary import * JIRA WDT-638 - separate Java and Python exception handling * JIRA WDT-638 - fix typo in import statements * JIRA WDT-638 - catch java.lang.Exception instead of Throwable * JIRA WDT-638 - handle sys.exit(). Ensure exception type is always printed/logged. * JIRA WDT-638 - out with the camel names, in with the snake names * WDT-644 write log file path to tool startup stdout logs * Update WLSDeployLoggingConfig.java Remove unnecessary log operation
1 parent dff9de9 commit 72f1f5b

File tree

12 files changed

+31
-1
lines changed

12 files changed

+31
-1
lines changed

‎core/src/main/java/oracle/weblogic/deploy/logging/WLSDeployLoggingConfig.java

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,6 @@ public WLSDeployLoggingConfig() {
156156
System.exit(ERROR_EXIT_CODE);
157157
}
158158
PlatformLogger logger = WLSDeployLogFactory.getLogger(WLSDEPLOY_LOGGER_NAME); // make sure that this is the first logger
159-
logger.info("The {0} program will write its log to {1}", programName, logFileName);
160159
}
161160

162161
/**
@@ -168,6 +167,15 @@ public static synchronized File getLoggingDirectory() {
168167
return new File(loggingDirectory.getAbsolutePath());
169168
}
170169

170+
/**
171+
* Log the logging directory path
172+
*
173+
*/
174+
public static void logLoggingDirectory(String programName) {
175+
PlatformLogger logger = WLSDeployLogFactory.getLogger(WLSDEPLOY_LOGGER_NAME);
176+
logger.info("WLSDPLY-01755", programName, loggingDirectory.getAbsolutePath());
177+
}
178+
171179
/**
172180
* Get the logging.properties file.
173181
*

‎core/src/main/python/create.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
from java.lang import System
1515
from oracle.weblogic.deploy.create import CreateException
1616
from oracle.weblogic.deploy.deploy import DeployException
17+
from oracle.weblogic.deploy.logging import WLSDeployLoggingConfig
1718
from oracle.weblogic.deploy.util import CLAException
1819
from oracle.weblogic.deploy.util import FileUtils
1920
from oracle.weblogic.deploy.util import WLSDeployArchiveIOException
@@ -379,6 +380,7 @@ def main(args):
379380

380381
if __name__ == '__main__' or __name__ == 'main':
381382
WebLogicDeployToolingVersion.logVersionInfo(_program_name)
383+
WLSDeployLoggingConfig.logLoggingDirectory(_program_name)
382384
try:
383385
main(sys.argv)
384386
except exceptions.SystemExit, ex:

‎core/src/main/python/deploy.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010

1111
from oracle.weblogic.deploy.deploy import DeployException
1212
from oracle.weblogic.deploy.exception import BundleAwareException
13+
from oracle.weblogic.deploy.logging import WLSDeployLoggingConfig
1314
from oracle.weblogic.deploy.util import CLAException
1415
from oracle.weblogic.deploy.util import WebLogicDeployToolingVersion
1516

@@ -261,6 +262,7 @@ def main(args):
261262

262263
if __name__ == '__main__' or __name__ == 'main':
263264
WebLogicDeployToolingVersion.logVersionInfo(_program_name)
265+
WLSDeployLoggingConfig.logLoggingDirectory(_program_name)
264266
try:
265267
main(sys.argv)
266268
except exceptions.SystemExit, ex:

‎core/src/main/python/discover.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
from oracle.weblogic.deploy.aliases import AliasException
1616
from oracle.weblogic.deploy.discover import DiscoverException
1717
from oracle.weblogic.deploy.json import JsonException
18+
from oracle.weblogic.deploy.logging import WLSDeployLoggingConfig
1819
from oracle.weblogic.deploy.util import CLAException
1920
from oracle.weblogic.deploy.util import FileUtils
2021
from oracle.weblogic.deploy.util import PyOrderedDict
@@ -641,6 +642,7 @@ def main(args):
641642

642643
if __name__ == '__main__' or __name__ == 'main':
643644
WebLogicDeployToolingVersion.logVersionInfo(_program_name)
645+
WLSDeployLoggingConfig.logLoggingDirectory(_program_name)
644646
try:
645647
main(sys.argv)
646648
except exceptions.SystemExit, ex:

‎core/src/main/python/encrypt.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
from java.lang import String, System
1212

1313
from oracle.weblogic.deploy.encrypt import EncryptionException
14+
from oracle.weblogic.deploy.logging import WLSDeployLoggingConfig
1415
from oracle.weblogic.deploy.util import CLAException
1516
from oracle.weblogic.deploy.util import TranslateException
1617
from oracle.weblogic.deploy.util import VariableException
@@ -255,6 +256,7 @@ def main(args):
255256

256257
if __name__ == '__main__' or __name__ == 'main':
257258
WebLogicDeployToolingVersion.logVersionInfo(_program_name)
259+
WLSDeployLoggingConfig.logLoggingDirectory(_program_name)
258260
try:
259261
main(sys.argv)
260262
except exceptions.SystemExit, ex:

‎core/src/main/python/extract_resource.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
import sys
99

1010
from oracle.weblogic.deploy.deploy import DeployException
11+
from oracle.weblogic.deploy.logging import WLSDeployLoggingConfig
1112
from oracle.weblogic.deploy.util import CLAException
1213
from oracle.weblogic.deploy.util import WebLogicDeployToolingVersion
1314

@@ -160,6 +161,7 @@ def main(args):
160161

161162
if __name__ == '__main__' or __name__ == 'main':
162163
WebLogicDeployToolingVersion.logVersionInfo(_program_name)
164+
WLSDeployLoggingConfig.logLoggingDirectory(_program_name)
163165
try:
164166
main(sys.argv)
165167
except exceptions.SystemExit, ex:

‎core/src/main/python/model_help.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
import os
99
import sys
1010

11+
from oracle.weblogic.deploy.logging import WLSDeployLoggingConfig
1112
from oracle.weblogic.deploy.util import CLAException
1213
from oracle.weblogic.deploy.util import WebLogicDeployToolingVersion
1314

@@ -451,6 +452,7 @@ def main(args):
451452

452453
if __name__ == '__main__' or __name__ == 'main':
453454
WebLogicDeployToolingVersion.logVersionInfo(_program_name)
455+
WLSDeployLoggingConfig.logLoggingDirectory(_program_name)
454456
try:
455457
main(sys.argv)
456458
except exceptions.SystemExit, ex:

‎core/src/main/python/prepare_model.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
import sys
1212
import traceback
1313

14+
from oracle.weblogic.deploy.logging import WLSDeployLoggingConfig
1415
from oracle.weblogic.deploy.util import CLAException
1516
from oracle.weblogic.deploy.util import PyWLSTException
1617
from oracle.weblogic.deploy.util import WebLogicDeployToolingVersion
@@ -111,6 +112,7 @@ def main():
111112

112113
if __name__ == "__main__" or __name__ == 'main':
113114
WebLogicDeployToolingVersion.logVersionInfo(_program_name)
115+
WLSDeployLoggingConfig.logLoggingDirectory(_program_name)
114116
try:
115117
main()
116118
except exceptions.SystemExit, ex:

‎core/src/main/python/update.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
import sys
1010

1111
from oracle.weblogic.deploy.deploy import DeployException
12+
from oracle.weblogic.deploy.logging import WLSDeployLoggingConfig
1213
from oracle.weblogic.deploy.exception import BundleAwareException
1314
from oracle.weblogic.deploy.util import CLAException
1415
from oracle.weblogic.deploy.util import WebLogicDeployToolingVersion
@@ -311,6 +312,7 @@ def main(args):
311312

312313
if __name__ == '__main__' or __name__ == 'main':
313314
WebLogicDeployToolingVersion.logVersionInfo(_program_name)
315+
WLSDeployLoggingConfig.logLoggingDirectory(_program_name)
314316
try:
315317
main(sys.argv)
316318
except exceptions.SystemExit, ex:

‎core/src/main/python/validate.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
from java.util.logging import Level
1313

1414
from oracle.weblogic.deploy.logging import WLSDeployLogEndHandler
15+
from oracle.weblogic.deploy.logging import WLSDeployLoggingConfig
1516
from oracle.weblogic.deploy.util import CLAException
1617
from oracle.weblogic.deploy.util import TranslateException
1718
from oracle.weblogic.deploy.util import VariableException

0 commit comments

Comments
 (0)