From 7e9a104ca5fc9eed00a8091255dd147aa83ee190 Mon Sep 17 00:00:00 2001 From: weishao Date: Tue, 7 Dec 2021 19:02:17 +0800 Subject: [PATCH] =?UTF-8?q?=E8=8A=82=E6=B5=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../educoder/bridge/webssh/service/TailfLogService.java | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/main/java/net/educoder/bridge/webssh/service/TailfLogService.java b/src/main/java/net/educoder/bridge/webssh/service/TailfLogService.java index 348a663..03a98de 100644 --- a/src/main/java/net/educoder/bridge/webssh/service/TailfLogService.java +++ b/src/main/java/net/educoder/bridge/webssh/service/TailfLogService.java @@ -15,10 +15,6 @@ import java.io.File; import java.io.IOException; import java.io.InputStreamReader; import java.util.concurrent.ConcurrentHashMap; -import java.io.*; -import java.util.Arrays; -import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.CopyOnWriteArrayList; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; @@ -50,7 +46,6 @@ public class TailfLogService { if ("log".equals(tp)) { // 不存在则创建 String filePath = "/data/workspace/myshixun_" + msg.getString("data") + "/user.out"; -// String filePath = "/tmp/myshixun_" + msg.getString("data") + "/user.out"; File file = new File(filePath); if (!file.exists()) { try { @@ -97,7 +92,6 @@ public class TailfLogService { * @param session session */ public void close(WebSocketSession session) { - if (session != null) { try { Process process = sessionProcessMap.get(session.getId()); @@ -124,11 +118,13 @@ public class TailfLogService { boolean result = false; try { session.sendMessage(new TextMessage(Base64Util.encodeBytes(buffer))); + Thread.sleep(100); result = true; } catch (IllegalStateException e) { logger.error("tailf连接断开, session: {}", session.getId(), e); } catch (IOException e) { logger.error("读取tailf输出异常, session: {}", session.getId(), e); + } catch (InterruptedException ignore) { } return result; }