ISPsystem/logs-collector
ISPsystem/logs-collector
5
1
Fork 0
Code Issues 3 Pull Requests Packages Projects 1 Releases Wiki Activity

Fix: ajax upload error message and increase the request timeout

Browse Source
This commit is contained in:
Stepan Zhukovsky 2023-08-31 13:34:40 +09:00
parent 20aa084c90
commit 790be86f13
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
logs_collector/collector/static/collector/js/jq.upload.progress.js
View File

@ -20,6 +20,7 @@ $(function () {
dataType: 'json', dataType: 'json',
xhr:function(){ xhr:function(){
const xhr = new window.XMLHttpRequest(); const xhr = new window.XMLHttpRequest();
xhr.timeout = 3600000; // increase request timeout to 1 hour
xhr.upload.addEventListener('progress', e=>{ xhr.upload.addEventListener('progress', e=>{
if(e.lengthComputable){ if(e.lengthComputable){
const percentProgress = (e.loaded/e.total)*100; const percentProgress = (e.loaded/e.total)*100;
@ -51,17 +52,17 @@ $(function () {
uploadForm.reset() uploadForm.reset()
progress_bar.classList.add('not-visible') progress_bar.classList.add('not-visible')
}, },
error: function(data, textStatus, jqXHR){ error: function(jqXHR, textStatus, errorThrown){
console.log(data.responseJSON.error); console.log(jqXHR);
let type = "danger"; let type = "danger";
let error_message = "Unexpected error. Try again please" let error_message = "Unexpected error. Try again please"
if (data.status === 423) { if (jqXHR.status === 423) {
error_message = `Error ${data.status}: ${data.responseJSON.error}` error_message = `Error ${jqXHR.status}: ${jqXHR.responseJSON.error}`
} }
if (data.status === 403) { if (jqXHR.status === 403) {
error_message = `Error ${data.status}: ${data.responseJSON.error}` error_message = `Error ${jqXHR.status}: ${jqXHR.responseJSON.error}`
} }
if (data.status === 401) { if (jqXHR.status === 401) {
error_message = 'The token field cannot be empty' error_message = 'The token field cannot be empty'
} }
alert_container.innerHTML = [ alert_container.innerHTML = [