gfwleak/appsketch-works-asw-controller
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: job 日志获取前校验 offset

Browse Source
This commit is contained in:
zhangshuai
2024-11-05 09:55:18 +08:00
parent 9ccd0ecc1f
commit 7e7ef56794
1 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/main/java/net/geedge/asw/module/runner/service/impl/JobServiceImpl.java
View File

@@ -156,13 +156,20 @@ public class JobServiceImpl extends ServiceImpl<JobDao, JobEntity> implements IJ
if (logFile.exists()){ if (logFile.exists()){
try (RandomAccessFile raf = new RandomAccessFile(logFile, "r")) { try (RandomAccessFile raf = new RandomAccessFile(logFile, "r")) {
raf.seek(offset); if (offset > raf.length()){
byte[] bytes = new byte[(int)raf.length() - offset]; result.put("content", T.StrUtil.EMPTY);
raf.readFully(bytes); result.put("length", 0);
String content = new String(bytes); result.put("offset", offset);
result.put("content", content); }else {
result.put("length", bytes.length); raf.seek(offset);
result.put("offset", offset + bytes.length); byte[] bytes = new byte[(int)raf.length() - offset];
raf.readFully(bytes);
String content = new String(bytes);
result.put("content", content);
result.put("length", bytes.length);
result.put("offset", offset + bytes.length);
}
} catch (IOException e) { } catch (IOException e) {
log.error("queryJobLog error", e); log.error("queryJobLog error", e);
throw new ASWException(RCode.ERROR); throw new ASWException(RCode.ERROR);