Skip to content

Wdt 644 -- output tool log file location at startup #1164

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 10 commits into from
Closed

Wdt 644 -- output tool log file location at startup #1164

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
d9d881d
JIRA WDT-638 - Should never exit with uncaught exceptions
jwgish Jul 5, 2022
e2a955c
JIRA WDT-638 - simplify handling of uncaught exceptions
jwgish Jul 6, 2022
cefd63a
JIRA WDT-638 - remove unnecessary import
jwgish Jul 6, 2022
b0ca00e
JIRA WDT-638 - separate Java and Python exception handling
jwgish Jul 7, 2022
9284bc6
JIRA WDT-638 - fix typo in import statements
jwgish Jul 7, 2022
3e41893
JIRA WDT-638 - catch java.lang.Exception instead of Throwable
jwgish Jul 19, 2022
c095f19
JIRA WDT-638 - handle sys.exit(). Ensure exception type is always pri…
jwgish Jul 19, 2022
214aa7d
JIRA WDT-638 - out with the camel names, in with the snake names
jwgish Jul 19, 2022
448db31
WDT-644 write log file path to tool startup stdout logs
jwgish Jul 27, 2022
e942f00
Merge branch 'main' into WDT-644
jwgish Jul 27, 2022
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
JIRA WDT-638 - simplify handling of uncaught exceptions
  • Loading branch information
@jwgish
jwgish committed Jul 6, 2022
commit e2a955cc26816521c798ec508d0681cbcc77f273
4 changes: 2 additions & 2 deletions core/src/main/python/compare_model.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -350,5 +350,5 @@ def format_message(key, *args):
if __name__ == "__main__":
try:
main()
except:
exception_helper.__handleUnexpectedException(sys.exc_info(), _program_name, _class_name, _logger)
except Exception, ex:
exception_helper.__handleUnexpectedException(ex, _program_name, _class_name, _logger)
4 changes: 2 additions & 2 deletions core/src/main/python/create.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -378,5 +378,5 @@ def main(args):
WebLogicDeployToolingVersion.logVersionInfo(_program_name)
try:
main(sys.argv)
except:
exception_helper.__handleUnexpectedException(sys.exc_info(), _program_name, _class_name, __logger)
except Exception, ex:
exception_helper.__handleUnexpectedException(ex, _program_name, _class_name, __logger)
4 changes: 2 additions & 2 deletions core/src/main/python/deploy.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,5 +261,5 @@ def main(args):
WebLogicDeployToolingVersion.logVersionInfo(_program_name)
try:
main(sys.argv)
except:
exception_helper.__handleUnexpectedException(sys.exc_info(), _program_name, _class_name, __logger)
except Exception, ex:
exception_helper.__handleUnexpectedException(ex, _program_name, _class_name, __logger)
5 changes: 3 additions & 2 deletions core/src/main/python/discover.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
from java.io import IOException
from java.lang import IllegalArgumentException
from java.lang import IllegalStateException
from java.lang import RuntimeException
from oracle.weblogic.deploy.aliases import AliasException
from oracle.weblogic.deploy.discover import DiscoverException
from oracle.weblogic.deploy.json import JsonException
Expand Down Expand Up @@ -640,6 +641,6 @@ def main(args):
WebLogicDeployToolingVersion.logVersionInfo(_program_name)
try:
main(sys.argv)
except:
exception_helper.__handleUnexpectedException(sys.exc_info(), _program_name, _class_name, __logger)
except Exception, ex:
exception_helper.__handleUnexpectedException(ex, _program_name, _class_name, __logger)

4 changes: 2 additions & 2 deletions core/src/main/python/encrypt.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -255,5 +255,5 @@ def main(args):
WebLogicDeployToolingVersion.logVersionInfo(_program_name)
try:
main(sys.argv)
except:
exception_helper.__handleUnexpectedException(sys.exc_info(), _program_name, _class_name, __logger)
except Exception, ex:
exception_helper.__handleUnexpectedException(ex, _program_name, _class_name, __logger)
4 changes: 2 additions & 2 deletions core/src/main/python/extract_resource.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,5 +160,5 @@ def main(args):
WebLogicDeployToolingVersion.logVersionInfo(_program_name)
try:
main(sys.argv)
except:
exception_helper.__handleUnexpectedException(sys.exc_info(), _program_name, _class_name, __logger)
except Exception, ex:
exception_helper.__handleUnexpectedException(ex, _program_name, _class_name, __logger)
4 changes: 2 additions & 2 deletions core/src/main/python/model_help.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,5 +135,5 @@ def main(args):
WebLogicDeployToolingVersion.logVersionInfo(_program_name)
try:
main(sys.argv)
except:
exception_helper.__handleUnexpectedException(sys.exc_info(), _program_name, _class_name, __logger)
except Exception, ex:
exception_helper.__handleUnexpectedException(ex, _program_name, _class_name, __logger)
4 changes: 2 additions & 2 deletions core/src/main/python/prepare_model.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,5 +112,5 @@ def main():
WebLogicDeployToolingVersion.logVersionInfo(_program_name)
try:
main()
except:
exception_helper.__handleUnexpectedException(sys.exc_info(), _program_name, _class_name, __logger)
except Exception, ex:
exception_helper.__handleUnexpectedException(ex, _program_name, _class_name, __logger)
4 changes: 2 additions & 2 deletions core/src/main/python/update.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -311,5 +311,5 @@ def main(args):
WebLogicDeployToolingVersion.logVersionInfo(_program_name)
try:
main(sys.argv)
except:
exception_helper.__handleUnexpectedException(sys.exc_info(), _program_name, _class_name, __logger)
except Exception, ex:
exception_helper.__handleUnexpectedException(ex, _program_name, _class_name, __logger)
4 changes: 2 additions & 2 deletions core/src/main/python/validate.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,5 +198,5 @@ def main(args):
WebLogicDeployToolingVersion.logVersionInfo(_program_name)
try:
main(sys.argv)
except:
exception_helper.__handleUnexpectedException(sys.exc_info(), _program_name, _class_name, __logger)
except Exception, ex:
exception_helper.__handleUnexpectedException(ex, _program_name, _class_name, __logger)
4 changes: 2 additions & 2 deletions core/src/main/python/variable_inject.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,5 +206,5 @@ def main(args):
WebLogicDeployToolingVersion.logVersionInfo(_program_name)
try:
main(sys.argv)
except:
exception_helper.__handleUnexpectedException(sys.exc_info(), _program_name, _class_name, __logger)
except Exception, ex:
exception_helper.__handleUnexpectedException(ex, _program_name, _class_name, __logger)
6 changes: 2 additions & 4 deletions core/src/main/python/wlsdeploy/exception/exception_helper.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -485,8 +485,6 @@ def __handleUnexpectedException(ex, program_name, class_name, logger):
:param class_name: the class where it occurred
:param logger: the logger to use
"""
exc_type, exc_obj, exc_tb = sys.exc_info()
ee_string = traceback.format_exception(exc_type, exc_obj, exc_tb)
logger.severe('WLSDPLY-20035', program_name, exc_obj)
logger.finer('WLSDPLY-20036', program_name, ee_string)
logger.severe('WLSDPLY-20035', program_name, ex)
logger.finer('WLSDPLY-20036', program_name, ex.stackTrace)
__log_and_exit(logger, CommandLineArgUtil.PROG_ERROR_EXIT_CODE, class_name)