Skip to content

fix(#5370): fix logfile view styling issues and make sure that links are rendered with an underline similarly to what already happens in other views #5388

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

Open
cdprete wants to merge 1 commit into
base: master
Choose a base branch
from
+38 −11
Open

fix(#5370): fix logfile view styling issues and make sure that links are rendered with an underline similarly to what already happens in other views #5388

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions ...ample-servlet/src/main/java/de/codecentric/boot/admin/sample/QuartzJobsConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@
import org.quartz.SimpleScheduleBuilder;
import org.quartz.Trigger;
import org.quartz.TriggerBuilder;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.scheduling.quartz.QuartzJobBean;
Expand Down Expand Up @@ -108,9 +110,11 @@ public Trigger hourlyTestTrigger() {
*/
public static class SampleJob extends QuartzJobBean {

private static final Logger logger = LoggerFactory.getLogger(SampleJob.class);

@Override
protected void executeInternal(org.quartz.JobExecutionContext context) {
System.out.println("Sample Quartz Job executed at " + new java.util.Date());
logger.info("Sample Quartz Job executed at {}", new java.util.Date());
}

}
Expand All @@ -120,9 +124,11 @@ protected void executeInternal(org.quartz.JobExecutionContext context) {
*/
public static class AnotherSampleJob extends QuartzJobBean {

private static final Logger logger = LoggerFactory.getLogger(AnotherSampleJob.class);

@Override
protected void executeInternal(org.quartz.JobExecutionContext context) {
System.out.println("Another Quartz Job executed at " + new java.util.Date());
logger.info("Another Quartz Job executed at {}", new java.util.Date());
}

}
Expand Down
12 changes: 9 additions & 3 deletions spring-boot-admin-server-ui/src/main/frontend/utils/logtail.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ import { EMPTY, Observable, catchError, concatMap, of, timer } from './rxjs';
export default (getFn, interval, initialSize = 300 * 1024) => {
let range = `bytes=-${initialSize}`;
let size = 0;
let atTheEnd = false;

return timer(0, interval).pipe(
concatMap(() => {
Expand Down Expand Up @@ -46,7 +47,10 @@ export default (getFn, interval, initialSize = 300 * 1024) => {
size = contentLength;
range = `bytes=${size - 1}-`;
} else if (response.status === 206) {
size = parseInt(response.headers['content-range'].split('/')[1]);
const contentRangeParts = response.headers['content-range'].split('/');
size = parseInt(contentRangeParts[1]);
// The end value of the range is always one byte less than the size when at the end
atTheEnd = parseInt(contentRangeParts[0].split('-')[1]) == size - 1;
range = `bytes=${size - 1}-`;
} else if (response.status === 416) {
size = 0;
Expand All @@ -68,15 +72,17 @@ export default (getFn, interval, initialSize = 300 * 1024) => {
skipped = size - addendum.length;
}
} else if (response.data.length > 1) {
// Remove the first byte which has been part of the previos response.
// Remove the first byte which has been part of the previous response.
addendum = response.data.substring(1);
}

return addendum
? of({
totalBytes: size,
skipped,
addendum,
// The log file always temporarily ends with a new line until the next one is written.
// Therefore, if we're at the end of it, we drop such a new line.
addendum: atTheEnd ? addendum.trimEnd() : addendum,
})
: EMPTY;
}),
Expand Down
27 changes: 21 additions & 6 deletions spring-boot-admin-server-ui/src/main/frontend/views/instances/logfile/index.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@
:class="{ 'wrap-lines': wrapLines }"
class="log-viewer overflow-x-auto text-sm -mx-6 -my-20 pt-14"
>
<table class="table-striped" />
<table ref="logContainer" class="table-striped min-w-full" />
</div>
</sba-instance-section>
</template>
Expand Down Expand Up @@ -191,14 +191,20 @@ export default {
.subscribe({
next: (lines) => {
this.hasLoaded = true;
const logContainer = this.$refs.logContainer;
lines.forEach((line) => {
let content;
if (line) {
content = document.createElement('pre');
content.innerHTML = autolink(this.ansiUp.ansi_to_html(line));
} else {
content = document.createElement('br');
}
const row = document.createElement('tr');
const col = document.createElement('td');
const pre = document.createElement('pre');
pre.innerHTML = autolink(this.ansiUp.ansi_to_html(line));
col.appendChild(pre);
col.appendChild(content);
row.appendChild(col);
document.querySelector('.log-viewer > table')?.appendChild(row);
logContainer.appendChild(row);
});

if (this.atBottom) {
Expand Down Expand Up @@ -269,15 +275,24 @@ export default {
max-height: 100%;
}

.log-viewer tr,
.log-viewer td {
@apply w-full;
}

.log-viewer pre {
padding: 0 0.75em;
margin-bottom: 1px;
}

.log-viewer pre:hover {
.log-viewer td:hover {
background: #dbdbdb;
}

.log-viewer a[href] {
@apply underline;
}

.log-viewer.wrap-lines pre {
@apply whitespace-pre-wrap;
word-break: break-all;
Expand Down