Merge branch 'fix/chore-fix' into dev/plugin-deploy

This commit is contained in:
Yeuoly 2024-11-12 20:48:51 +08:00
commit a42b081e32
No known key found for this signature in database
GPG Key ID: A66E7E320FB19F61
2 changed files with 4 additions and 4 deletions

View File

@ -134,10 +134,10 @@ class BasePluginManager:
try:
error = PluginDaemonError(**json.loads(rep.message))
except Exception as e:
raise ValueError(f"got error from plugin daemon: {rep.message}, code: {rep.code}")
raise ValueError(f"{rep.message}, code: {rep.code}")
self._handle_plugin_daemon_error(error.error_type, error.message, error.args)
raise ValueError(f"got error from plugin daemon: {rep.message}, code: {rep.code}")
raise ValueError(f"{rep.message}, code: {rep.code}")
if rep.data is None:
raise ValueError("got empty data from plugin daemon")
@ -176,7 +176,7 @@ class BasePluginManager:
raise PluginDaemonInnerError(code=rep.code, message=rep.message)
self._handle_plugin_daemon_error(error.error_type, error.message, error.args)
raise ValueError(f"got error from plugin daemon: {rep.message}, code: {rep.code}")
raise ValueError(f"plugin daemon: {rep.message}, code: {rep.code}")
if rep.data is None:
raise ValueError("got empty data from plugin daemon")
yield rep.data

View File

@ -184,7 +184,7 @@ class PluginInstallationManager(BasePluginManager):
"""
return self._request_with_plugin_daemon_response(
"POST",
f"plugin/{tenant_id}/management/upgrade",
f"plugin/{tenant_id}/management/install/upgrade",
PluginInstallTaskStartResponse,
data={
"original_plugin_unique_identifier": original_plugin_unique_identifier,