Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions src/components/logs/hooks/useWebSocketLogs.ts
Original file line number Diff line number Diff line change
Expand Up @@ -89,18 +89,18 @@ export function useWebSocketLogs(showTimestamps: boolean, uuid?: string) {
const params = new URLSearchParams();

if (jobInfo.websocket) {
const follow = jobInfo.websocket.parameters.follow;
params.append('podName', jobInfo.websocket.parameters.podName);
params.append('namespace', jobInfo.websocket.parameters.namespace);
params.append('containerName', containerName);
params.append('follow', jobInfo.websocket.parameters.follow.toString());
params.append('tailLines', '500');
params.append('follow', follow.toString());
if (follow) params.append('tailLines', '1000');
params.append('timestamps', showTimestamps.toString());
} else if (jobInfo.podName) {
params.append('podName', jobInfo.podName);
params.append('namespace', `env-${uuid}`);
params.append('containerName', containerName);
params.append('follow', 'false');
params.append('tailLines', '500');
params.append('timestamps', showTimestamps.toString());
}

Expand Down
4 changes: 2 additions & 2 deletions src/server/lib/k8sStreamer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ export function streamK8sLogs(
namespace: string;
containerName: string;
follow: boolean;
tailLines: number;
tailLines?: number;
timestamps: boolean;
},
callbacks: {
Expand Down Expand Up @@ -112,7 +112,7 @@ export function streamK8sLogs(
try {
const logOptions = {
follow,
tailLines,
...(tailLines !== undefined ? { tailLines } : {}),
timestamps,
pretty: false,
};
Expand Down
4 changes: 2 additions & 2 deletions ws-server.ts
Original file line number Diff line number Diff line change
Expand Up @@ -104,9 +104,9 @@ app.prepare().then(() => {
throw new Error('Missing or invalid required parameters: podName, namespace, containerName');
}
const follow = followStr === 'true';
const tailLines = tailLinesStr ? parseInt(tailLinesStr as string, 10) : 200;
const tailLines = tailLinesStr ? parseInt(tailLinesStr as string, 10) : undefined;
const timestamps = timestampsStr === 'true';
if (isNaN(tailLines)) throw new Error('Invalid tailLines parameter.');
if (tailLines !== undefined && isNaN(tailLines)) throw new Error('Invalid tailLines parameter.');

logger.debug(logCtx, 'Initiating K8s log stream');
k8sStreamAbort = streamK8sLogs(
Expand Down