tryton-do/tryton
2
0 Fork 0
Code Issues Pull Requests 2 Actions 2 Packages Projects Releases Wiki Activity

Use a standard reporting mecanism for all HTTP errors

Browse Source
This commit is contained in:
Nicolas Évrard committed 2023-11-13 10:40:21 +01:00
1 parent 2ff6251c0e
commit e084ca5d66
2 files changed
+7 -20
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

sao/src/rpc.js
+4 -12
View File
@@ -134,19 +134,11 @@
dfd.resolve();
}
}, dfd.reject);
} else if (query.status == 408) {
Sao.common.message.run(
Sao.i18n.gettext('Request times out. Try again later.'),
'tryton-error')
.always(dfd.reject);
} else if (query.status == 429) {
Sao.common.message.run(
Sao.i18n.gettext('Too many requests. Try again later.'),
'tryton-error')
.always(dfd.reject);
} else {
Sao.common.error.run(status_, error)
.always(dfd.reject);
var err_msg = `[${query.status}] ${error}`;
Sao.common.message.run(
Sao.i18n.gettext('Error: "%1". Try again later.', err_msg),
'tryton-error').always(dfd.reject);
}
};
tryton/tryton/common/common.py
+3 -8
View File
@@ -1014,16 +1014,11 @@ def process_exception(exception, *args, **kwargs):
PLOCK.release()
if args:
return rpc_execute(*args)
elif exception.faultCode == str(int(HTTPStatus.REQUEST_TIMEOUT)):
elif exception.faultCode in map(str, HTTPStatus):
err_msg = '[%s] %s' % (exception.faultCode, exception.faultString)
message(
_("Request times out. Try again later."),
_('Error "%s". Try again later.') % err_msg,
msg_type=Gtk.MessageType.ERROR)
elif exception.faultCode == str(int(HTTPStatus.TOO_MANY_REQUESTS)):
message(
_('Too many requests. Try again later.'),
msg_type=Gtk.MessageType.ERROR)
elif exception.faultCode == str(int(HTTPStatus.NOT_FOUND)):
message(_("Not found."), msg_type=Gtk.MessageType.ERROR)
else:
error(exception, exception.faultString)
else: