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

refactor: update logs listener

Browse Source
This commit is contained in:
Mauricio Siu
2024-10-05 17:34:17 -06:00
parent 8397de0dca
commit 405efcac0b
3 changed files with 7 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -20,9 +20,9 @@ export const DockerLogsId: React.FC<Props> = ({
const [lines, setLines] = React.useState<number>(40); const [lines, setLines] = React.useState<number>(40);
const wsRef = useRef<WebSocket | null>(null); // Ref to hold WebSocket instance const wsRef = useRef<WebSocket | null>(null); // Ref to hold WebSocket instance
const createTerminal = (): Terminal => { useEffect(() => {
if (containerId === "select-a-containe") { if (containerId === "select-a-containe") {
return new Terminal(); return;
} }
const container = document.getElementById(id); const container = document.getElementById(id);
if (container) { if (container) {
@@ -72,16 +72,9 @@ export const DockerLogsId: React.FC<Props> = ({
termi.write(`Connection closed!\nReason: ${e.reason}\n`); termi.write(`Connection closed!\nReason: ${e.reason}\n`);
wsRef.current = null; wsRef.current = null;
}; };
return termi;
};
useEffect(() => {
createTerminal();
return () => { return () => {
if (wsRef.current?.readyState === WebSocket.OPEN) { if (wsRef.current?.readyState === WebSocket.OPEN) {
wsRef.current.close(); ws.close();
wsRef.current = null; wsRef.current = null;
} }
}; };

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

@@ -62,7 +62,7 @@ export const setupDockerContainerLogsWebSocketServer = (
} }
stream stream
.on("close", () => { .on("close", () => {
console.log("Connection closed ✅"); console.log("Connection closed ✅ Container Logs");
client.end(); client.end();
ws.close(); ws.close();
}) })
@@ -86,7 +86,7 @@ export const setupDockerContainerLogsWebSocketServer = (
privateKey: server.sshKey?.privateKey, privateKey: server.sshKey?.privateKey,
}); });
ws.on("close", () => { ws.on("close", () => {
console.log("Connection closed ✅, From WS"); console.log("Connection closed ✅, From Container Logs WS");
client.end(); client.end();
}); });
} else { } else {

4
apps/dokploy/server/wss/listen-deployment.ts
View File

@@ -105,8 +105,8 @@ export const setupDeploymentLogsWebSocketServer = (
} }
} catch (error) { } catch (error) {
// @ts-ignore // @ts-ignore
// const errorMessage = error?.message as unknown as string; // const errorMessage = error?.message as unknown as string;
ws.send(errorMessage); // ws.send(errorMessage);
} }
}); });
}; };