修复启动器未压缩日志的问题 (#3877)

This commit is contained in:
Glavo
2025-04-30 14:56:03 +08:00
committed by GitHub
parent 9a37d412a3
commit bfa9c1a697

View File

@@ -143,35 +143,33 @@ public final class Logger {
log(Level.WARNING, caller, "Failed to list log files in " + dir, e); log(Level.WARNING, caller, "Failed to list log files in " + dir, e);
} }
if (list.size() <= logRetention) { if (list.size() > logRetention) {
return; list.sort((a, b) -> {
} int[] v1 = a.getValue();
int[] v2 = b.getValue();
list.sort((a, b) -> { assert v1.length == v2.length;
int[] v1 = a.getValue();
int[] v2 = b.getValue();
assert v1.length == v2.length; for (int i = 0; i < v1.length; i++) {
int c = Integer.compare(v1[i], v2[i]);
for (int i = 0; i < v1.length; i++) { if (c != 0)
int c = Integer.compare(v1[i], v2[i]); return c;
if (c != 0) }
return c;
} return 0;
});
return 0;
}); for (int i = 0, end = list.size() - logRetention; i < end; i++) {
Path file = list.get(i).getKey();
for (int i = 0, end = list.size() - logRetention; i < end; i++) {
Path file = list.get(i).getKey(); try {
if (!Files.isSameFile(file, logFile)) {
try { log(Level.INFO, caller, "Delete old log file " + file, null);
if (!Files.isSameFile(file, logFile)) { Files.delete(file);
log(Level.INFO, caller, "Delete old log file " + file, null); }
Files.delete(file); } catch (IOException e) {
log(Level.WARNING, caller, "Failed to delete log file " + file, e);
} }
} catch (IOException e) {
log(Level.WARNING, caller, "Failed to delete log file " + file, e);
} }
} }
} }