Fixed an issue where the entire logs is in red text when the user runs backup and restore. Fixes #5604

This commit is contained in:
Akshay Joshi
2020-08-17 17:23:30 +05:30
parent 0122cf9aac
commit b0af385ea0
2 changed files with 15 additions and 2 deletions

View File

@@ -193,7 +193,13 @@ define('misc.bgprocess', [
if (pgAdmin.natural_sort(out[io][0], err[ie][0]) <= 0) {
res.push('<li class="pg-bg-res-out">' + escapeHTML(out[io++][1]) + '</li>');
} else {
res.push('<li class="pg-bg-res-err">' + escapeHTML(err[ie++][1]) + '</li>');
let log_msg = escapeHTML(err[ie++][1]);
let regex_obj = new RegExp(': (' + gettext('error') + '|' + gettext('fatal') + '):', 'i');
if (regex_obj.test(log_msg)) {
res.push('<li class="pg-bg-res-err">' + log_msg + '</li>');
} else {
res.push('<li class="pg-bg-res-out">' + log_msg + '</li>');
}
}
}
@@ -202,7 +208,13 @@ define('misc.bgprocess', [
}
while (ie < err.length) {
res.push('<li class="pg-bg-res-err">' + escapeHTML(err[ie++][1]) + '</li>');
let log_msg = escapeHTML(err[ie++][1]);
let regex_obj = new RegExp(': (' + gettext('error') + '|' + gettext('fatal') + '):', 'i');
if (regex_obj.test(log_msg)) {
res.push('<li class="pg-bg-res-err">' + log_msg + '</li>');
} else {
res.push('<li class="pg-bg-res-out">' + log_msg + '</li>');
}
}
if (res.length) {