Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[JENKINS-72509] show error message in progressive logs on 4xx status codes #8907

Merged
merged 3 commits into from
Feb 1, 2024
Merged

[JENKINS-72509] show error message in progressive logs on 4xx status codes #8907

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1ab9182
[JENKINS-72509] avoid broken log when deleting job/agent
mawinter69 Jan 28, 2024
c8aa4f0
do not reload but print an error
mawinter69 Jan 30, 2024
b4d0472
apply prettier
mawinter69 Jan 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
15 changes: 14 additions & 1 deletion core/src/main/resources/lib/hudson/progressive-text.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ Behaviour.specify(
let spinner = holder.getAttribute("data-spinner");
let startOffset = holder.getAttribute("data-start-offset");
let onFinishEvent = holder.getAttribute("data-on-finish-event");
let errorMessage = holder.getAttribute("data-error-message");

var scroller = new AutoScroller(document.body);
/*
Expand Down Expand Up @@ -43,8 +44,20 @@ Behaviour.specify(
location.reload();
return;
}
/* append text and do autoscroll if applicable */
var stickToBottom = scroller.isSticking();
if (rsp.status >= 400) {
var p = document.createElement("DIV");
e.appendChild(p);
p.innerHTML = '<br/><div class="error">' + errorMessage + "</div>";
if (stickToBottom) {
scroller.scrollToBottom();
}
if (spinner !== "") {
document.getElementById(spinner).style.display = "none";
}
return;
}
/* append text and do autoscroll if applicable */
rsp.text().then((responseText) => {
var text = responseText;
if (text !== "") {
Expand Down
4 changes: 3 additions & 1 deletion core/src/main/resources/lib/hudson/progressiveText.jelly
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,8 @@ THE SOFTWARE.
-->
<?jelly escape-by-default='true'?>
<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
<div class="progressiveText-holder" data-href="${href}" data-idref="${idref}" data-spinner="${spinner}" data-start-offset="${startOffset}" data-on-finish-event="${empty(onFinishEvent) ? '' : onFinishEvent}"/>
<div class="progressiveText-holder" data-href="${href}" data-idref="${idref}" data-spinner="${spinner}" data-start-offset="${startOffset}"
data-on-finish-event="${empty(onFinishEvent) ? '' : onFinishEvent}"
data-error-message="${%errorMessage}"/>
<st:adjunct includes="lib.hudson.progressive-text"/>
</j:jelly>
1 change: 1 addition & 0 deletions core/src/main/resources/lib/hudson/progressiveText.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
errorMessage=Failed to fetch more data. The page might no longer exist or you no longer have permission to see it.