Skip to content

optimization: optimization the log file read #10141

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

Merged
f2c-ci-robot merged 1 commit into from
Aug 26, 2025
Merged

optimization: optimization the log file read #10141

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
15 changes: 13 additions & 2 deletions frontend/src/components/log/custom-hightlight/index.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,21 @@ const props = defineProps<{
const rules = ref<TokenRule[]>([]);
const nginxRules: TokenRule[] = [
{
type: 'log-level',
pattern: /\[(error|warn|notice|info|debug)\]/gi,
type: 'log-level-warn',
pattern: /\b(warn|warning|NOTICE)\b/g,
color: '#F39C12',
},
{
type: 'log-level-info',
pattern: /\b(info|debug)\b/g,
color: '#3498DB',
},
{
type: 'log-level-error',
pattern: /\[(crit|error)\]/g,
color: '#E74C3C',
},

{
type: 'path',
pattern: /(?<=[\s"])\/[^"\s]+(?:\.\w+)?(?:\?\w+=\w+)?/g,
Expand Down
75 changes: 37 additions & 38 deletions frontend/src/components/log/file/index.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,36 +156,34 @@ const visibleLogs = computed(() => {
return logs.value.slice(startIndex.value, startIndex.value + visibleCount.value);
});

let scrollTimer: ReturnType<typeof setTimeout> | null = null;

const onScroll = () => {
const onScroll = async () => {
if (!logContainer.value || isLoading.value) return;

const scrollTop = logContainer.value.scrollTop;
const newStartIndex = Math.max(0, Math.floor(scrollTop / logHeight));
const scrollHeight = logContainer.value.scrollHeight;
const clientHeight = logContainer.value.clientHeight;

if (scrollTimer) {
clearTimeout(scrollTimer);
}
lastScrollTop.value = scrollTop;

const newStartIndex = Math.max(0, Math.floor(scrollTop / logHeight));
startIndex.value = newStartIndex;

scrollTimer = setTimeout(() => {
if (scrollTop <= logHeight && minPage.value > 1) {
const currentScrollTop = scrollTop;
readReq.page = minPage.value - 1;
if (readReq.page >= 1) {
minPage.value = readReq.page;
lastScrollTop.value = currentScrollTop;
getContent(true);
}
if (scrollTop <= 50 && readReq.page > 1) {
if (minPage.value <= 1) {
return;
}
readReq.page = minPage.value > 1 ? minPage.value - 1 : 1;
minPage.value = readReq.page;
await getContent(true);
return;
}

if (!tailLog.value && scrollTop + containerHeight.value >= totalHeight.value - logHeight && maxPage.value > 1) {
readReq.page = maxPage.value;
getContent(false);
if (scrollHeight - scrollTop - clientHeight <= 50 && !end.value) {
if (readReq.page < maxPage.value) {
readReq.page++;
await getContent(false);
}
}, 50);
}
};

const changeLoading = () => {
Expand Down Expand Up @@ -222,13 +220,6 @@ const getContent = async (pre: boolean) => {
if (isLoading.value) {
return;
}
readReq.id = props.config.id;
readReq.type = props.config.type;
readReq.name = props.config.name;
readReq.taskID = props.config.taskID;
readReq.taskType = props.config.taskType;
readReq.taskOperate = props.config.taskOperate;
readReq.resourceID = props.config.resourceID;
if (readReq.page < 1) {
readReq.page = 1;
}
Expand Down Expand Up @@ -280,15 +271,12 @@ const getContent = async (pre: boolean) => {
if (stopSignals.some((signal) => newLogs[newLogs.length - 1].endsWith(signal))) {
onCloseLog();
}
if (end.value) {
if ((logs.value.length = 0)) {
logs.value = newLogs;
} else {
logs.value = pre ? [...newLogs, ...lastLogs.value] : [...lastLogs.value, ...newLogs];
}

if (logs.value.length == 0) {
logs.value = newLogs;
} else {
if ((logs.value.length = 0)) {
logs.value = newLogs;
if (end.value) {
logs.value = pre ? [...newLogs, ...lastLogs.value] : [...lastLogs.value, ...newLogs];
} else {
logs.value = pre ? [...newLogs, ...logs.value] : [...logs.value, ...newLogs];
}
Expand All @@ -297,9 +285,9 @@ const getContent = async (pre: boolean) => {
nextTick(() => {
if (logContainer.value) {
if (pre) {
if (!end.value) {
if (readReq.page > 1) {
const addedLines = newLogs.length;
const newScrollPosition = lastScrollTop.value + addedLines * logHeight;
const newScrollPosition = lastScrollTop.value + (addedLines * logHeight) / 3;
logContainer.value.scrollTop = newScrollPosition;
startIndex.value = Math.max(0, Math.floor(newScrollPosition / logHeight));
}
Expand All @@ -319,7 +307,11 @@ const getContent = async (pre: boolean) => {
readReq.page = res.data.total;
readReq.latest = false;
maxPage.value = res.data.total;
minPage.value = res.data.total;
if (res.data.lines && res.data.lines.length > 500) {
minPage.value = res.data.total - 1;
} else {
minPage.value = res.data.total;
}
}
if (logs.value && logs.value.length > 3000) {
if (pre) {
Expand Down Expand Up @@ -379,6 +371,13 @@ onMounted(async () => {
logs.value = [];
isTailDisabled.value = false;
firstLoading.value = true;
readReq.id = props.config.id;
readReq.type = props.config.type;
readReq.name = props.config.name;
readReq.taskID = props.config.taskID;
readReq.taskType = props.config.taskType;
readReq.taskOperate = props.config.taskOperate;
readReq.resourceID = props.config.resourceID;
await init();
nextTick(() => {
if (logContainer.value) {
Expand Down
Loading