BIGTOP-4159: Reading agent task log encoding garbled bug fixing (#18)

apache · Jul 13, 2024 · b11d0db · b11d0db
1 parent 388c265
commit b11d0db
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/...r-agent/src/main/java/org/apache/bigtop/manager/agent/service/TaskLogServiceGrpcImpl.java b/...r-agent/src/main/java/org/apache/bigtop/manager/agent/service/TaskLogServiceGrpcImpl.java
@@ -32,6 +32,7 @@
 
 import java.io.File;
 import java.io.RandomAccessFile;
+import java.nio.charset.StandardCharsets;
 
 @Slf4j
 @GrpcService
@@ -46,6 +47,7 @@ public void getLog(TaskLogRequest request, StreamObserver<TaskLogReply> response
             while (file.getFilePointer() < fileLength) {
                 String line = file.readLine();
                 if (line != null) {
+                    line = new String(line.getBytes(StandardCharsets.ISO_8859_1), StandardCharsets.UTF_8);
                     responseObserver.onNext(
                             TaskLogReply.newBuilder().setText(line).build());
                 }
@@ -76,9 +78,9 @@ private void readNewLogs(RandomAccessFile file, StreamObserver<TaskLogReply> res
             if (file.readByte() != '\n') {
                 file.seek(position);
             }
-
             String line = file.readLine();
             while (line != null) {
+                line = new String(line.getBytes(StandardCharsets.ISO_8859_1), StandardCharsets.UTF_8);
                 responseObserver.onNext(TaskLogReply.newBuilder().setText(line).build());
                 line = file.readLine();
             }