Elgato_dark/bunkerweb
1
0
Fork 0
mirror of https://github.com/bunkerity/bunkerweb synced 2026-05-24 09:28:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Refactor custom_plugin error handling

Browse source
This commit is contained in:
Théophile Diot 2024-01-31 15:35:02 +01:00
parent b6e9769224
commit db084c6f11
No known key found for this signature in database
GPG key ID: 248FEA4BAE400D06
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/ui/main.py
View file

@ -41,7 +41,6 @@ from tarfile import CompressionError, HeaderError, ReadError, TarError, open as
from threading import Thread
from tempfile import NamedTemporaryFile
from time import sleep, time
from traceback import format_exc
from zipfile import BadZipFile, ZipFile
from src.Instances import Instances
@ -1310,15 +1309,15 @@ def custom_plugin(plugin: str):
method = getattr(actions, plugin)
if request.args:
res = method(**request.args.to_dict())
elif request.json:
elif request.is_json:
res = method(**request.json)
else:
res = method()
except AttributeError:
message = f'The plugin "{plugin}" does not have a "{plugin}" method'
message = f'The plugin "{plugin}" does not have a "{plugin}" method, see logs for more details'
error = 404
except:
message = f'An error occurred while executing the plugin "{plugin}":\n{format_exc()}'
message = f'An error occurred while executing the plugin "{plugin}", see logs for more details'
error = 500
finally:
if sbin_nginx_path.is_file():
@ -1327,9 +1326,12 @@ def custom_plugin(plugin: str):
sys_modules.pop("actions")
del actions
if message or not res or isinstance(res, dict) is False:
if message or not res or not isinstance(res, dict):
message = message or f'The plugin "{plugin}" did not return a valid response'
app.logger.error(message)
if error:
app.logger.exception(message)
else:
app.logger.error(message)
return {"message": message}, error or 500
app.logger.info(f"Plugin {plugin} action executed successfully")