NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-08-18 21:48:16 -06:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

12510 review changes

Browse Source
This commit is contained in:
Arthur 2024-02-01 14:50:29 -08:00
parent da9b089723
commit 7e07136178
2 changed files with 16 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
netbox/extras/scripts.py
View File

@ -513,7 +513,7 @@ class BaseScript:
return data return data
def run_tests(self, job): def run_tests(self):
""" """
Run the report and save its results. Each test method will be executed in order. Run the report and save its results. Each test method will be executed in order.
""" """
@ -623,7 +623,7 @@ def run_script(data, job, request=None, commit=True, **kwargs):
raise AbortTransaction() raise AbortTransaction()
except AbortTransaction: except AbortTransaction:
msg = _("Database changes have been reverted automatically.") msg = _("Database changes have been reverted automatically.")
if is_report(script): if is_report(type(script)):
# script and legacy reports have different log function signatures # script and legacy reports have different log function signatures
script.log_info(message=msg) script.log_info(message=msg)
else: else:
@ -640,7 +640,7 @@ def run_script(data, job, request=None, commit=True, **kwargs):
except Exception as e: except Exception as e:
if type(e) is AbortScript: if type(e) is AbortScript:
msg = _("Script aborted with error: ") + str(e) msg = _("Script aborted with error: ") + str(e)
if is_report(script): if is_report(type(script)):
script.log_failure(message=msg) script.log_failure(message=msg)
else: else:
script.log_failure(msg) script.log_failure(msg)
@ -649,13 +649,13 @@ def run_script(data, job, request=None, commit=True, **kwargs):
else: else:
stacktrace = traceback.format_exc() stacktrace = traceback.format_exc()
msg = _("An exception occurred: : ") + f"`{type(e).__name__}: {e}`\n```\n{stacktrace}\n```" msg = _("An exception occurred: : ") + f"`{type(e).__name__}: {e}`\n```\n{stacktrace}\n```"
if is_report(script): if is_report(type(script)):
script.log_failure(message=msg) script.log_failure(message=msg)
else: else:
script.log_failure(msg) script.log_failure(msg)
logger.error(f"Exception raised during script execution: {e}") logger.error(f"Exception raised during script execution: {e}")
msg = _("Database changes have been reverted due to error.") msg = _("Database changes have been reverted due to error.")
if is_report(script): if is_report(type(script)):
script.log_info(message=msg) script.log_info(message=msg)
else: else:
script.log_info(msg) script.log_info(msg)

26
netbox/extras/utils.py
View File

@ -47,6 +47,17 @@ def register_features(model, features):
registry['models'][app_label].add(model_name) registry['models'][app_label].add(model_name)
def is_script(obj):
"""
Returns True if the object is a Script.
"""
from .scripts import Script
try:
return issubclass(obj, Script) and obj != Script
except TypeError:
return False
def is_report(obj): def is_report(obj):
""" """
Returns True if the given object is a Report. Returns True if the given object is a Report.
@ -54,20 +65,5 @@ def is_report(obj):
from .reports import Report from .reports import Report
try: try:
return issubclass(obj, Report) and obj != Report return issubclass(obj, Report) and obj != Report
except TypeError:
print("TypeError")
return False
def is_script(obj):
"""
Returns True if the object is a Script.
"""
# TODO: Deprecated legacy reports support
from .reports import Report
from .scripts import Script
try:
return ((issubclass(obj, Report) and obj != Report) or (issubclass(obj, Script) and obj != Script))
except TypeError: except TypeError:
return False return False