From fd0f4f59abe59cf3e098026676945f0196b6b0d7 Mon Sep 17 00:00:00 2001 From: Thibaut Valentin Date: Thu, 21 Mar 2024 16:32:31 +0100 Subject: [PATCH 1/2] fix: save media dir --- src/main/java/fr/titionfire/ffsaf/ws/FileSocket.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/main/java/fr/titionfire/ffsaf/ws/FileSocket.java b/src/main/java/fr/titionfire/ffsaf/ws/FileSocket.java index 0d7b3e2..ea4849c 100644 --- a/src/main/java/fr/titionfire/ffsaf/ws/FileSocket.java +++ b/src/main/java/fr/titionfire/ffsaf/ws/FileSocket.java @@ -1,7 +1,6 @@ package fr.titionfire.ffsaf.ws; import io.quarkus.runtime.annotations.RegisterForReflection; -import io.quarkus.scheduler.Scheduled; import jakarta.enterprise.context.ApplicationScoped; import jakarta.websocket.*; import jakarta.websocket.server.PathParam; @@ -23,7 +22,7 @@ public class FileSocket { @ConfigProperty(name = "upload_dir") String media; - @Scheduled(every = "10s") + /*@Scheduled(every = "10s") void increment() { sessions.forEach((key, value) -> { if (System.currentTimeMillis() - value.time > 60000) { @@ -40,14 +39,14 @@ public class FileSocket { sessions.remove(key); } }); - } + }*/ @OnOpen public void onOpen(Session session, @PathParam("code") String code) { try { if (sessions.containsKey(code)) { FileRecv fileRecv = sessions.get(code); - fileRecv.file = new File(media, "record/" + fileRecv.name); + fileRecv.file = new File(media + "-ext", "record/" + fileRecv.name); fileRecv.fos = new FileOutputStream(fileRecv.file, false); logger.info("Start reception of file: " + fileRecv.file.getAbsolutePath()); } else { From 9b5192c395ed2f1aeaafe14c47bdc7f8ec2c2319 Mon Sep 17 00:00:00 2001 From: Thibaut Valentin Date: Thu, 21 Mar 2024 16:33:29 +0100 Subject: [PATCH 2/2] fix: deploy timeout command --- .github/workflows/deploy.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 4e45d68..52f17e4 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -59,6 +59,7 @@ jobs: username: ${{ secrets.SSH_USER }} port: ${{ secrets.SSH_PORT }} key: ${{ secrets.SSH_KEY }} + command_timeout: 20m script: | cd ${{ secrets.TARGET_DIR }}/ffsaf cp ../vite.env src/main/webapp/.env