Dokploy/dokploy
1
0
Fork 0
mirror of https://github.com/Dokploy/dokploy synced 2025-06-26 18:27:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: remote server search add long buffering

Browse Source
This commit is contained in:
Mauricio Siu
2024-12-15 19:18:41 -06:00
parent 676082fc5b
commit c2fe1eed01
2 changed files with 25 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
apps/dokploy/components/dashboard/docker/logs/docker-logs-id.tsx
View File

@@ -59,8 +59,6 @@ export const DockerLogsId: React.FC<Props> = ({ containerId, serverId }) => {
};
const handleSearch = (e: React.ChangeEvent<HTMLInputElement>) => {
setRawLogs("");
setFilteredLogs([]);
setSearch(e.target.value || "");
};
@@ -81,13 +79,12 @@ export const DockerLogsId: React.FC<Props> = ({ containerId, serverId }) => {
};
useEffect(() => {
if (!containerId) return;
let isCurrentConnection = true;
setIsLoading(true);
setRawLogs("");
setFilteredLogs([]);
}, [containerId]);
useEffect(() => {
if (!containerId) return;
setIsLoading(true);
const protocol = window.location.protocol === "https:" ? "wss:" : "ws:";
const params = new globalThis.URLSearchParams({
@@ -108,25 +105,33 @@ export const DockerLogsId: React.FC<Props> = ({ containerId, serverId }) => {
const ws = new WebSocket(wsUrl);
ws.onopen = () => {
if (!isCurrentConnection) {
ws.close();
return;
}
console.log("WebSocket connected");
};
ws.onmessage = (e) => {
if (!isCurrentConnection) return;
setRawLogs((prev) => prev + e.data);
setIsLoading(false);
};
ws.onerror = (error) => {
if (!isCurrentConnection) return;
console.error("WebSocket error:", error);
setIsLoading(false);
};
ws.onclose = (e) => {
if (!isCurrentConnection) return;
console.log("WebSocket closed:", e.reason);
setIsLoading(false);
};
return () => {
isCurrentConnection = false;
if (ws.readyState === WebSocket.OPEN) {
ws.close();
}

15
apps/dokploy/server/wss/docker-container-logs.ts
View File

@@ -56,9 +56,11 @@ export const setupDockerContainerLogsWebSocketServer = (
const baseCommand = `docker container logs --timestamps --tail ${tail} ${
since === "all" ? "" : `--since ${since}`
} --follow ${containerId}`;
const escapedSearch = search ? search.replace(/'/g, "'\\''") : "";
const command = search
? `${baseCommand} 2>&1 | grep -iF '${search}'`
? `${baseCommand} 2>&1 | grep --line-buffered -iF "${escapedSearch}"`
: baseCommand;
console.log("Executing SSH command:", command);
client.exec(command, (err, stream) => {
if (err) {
console.error("Execution error:", err);
@@ -66,15 +68,24 @@ export const setupDockerContainerLogsWebSocketServer = (
client.end();
return;
}
let dataReceived = false;
stream
.on("close", () => {
console.log("Stream closed, dataReceived:", dataReceived);
if (!dataReceived) {
ws.send("No matching logs found");
}
client.end();
ws.close();
})
.on("data", (data: string) => {
dataReceived = true;
ws.send(data.toString());
})
.stderr.on("data", (data) => {
console.error("Stream stderr:", data.toString());
ws.send(data.toString());
});
});
@@ -100,7 +111,7 @@ export const setupDockerContainerLogsWebSocketServer = (
since === "all" ? "" : `--since ${since}`
} --follow ${containerId}`;
const command = search
? `${baseCommand} 2>&1 | grep -iF '${search}'`
? `${baseCommand} 2>&1 | grep --line-buffered -iF '${search}'`
: baseCommand;
const ptyProcess = spawn(shell, ["-c", command], {
name: "xterm-256color",