opendev/gerrit
Code Issues Proposed changes

Merge branch 'stable-2.14'

Browse Source 
* stable-2.14:
  Fix log compression

Change-Id: I40607c737355007c4e2bdf0c8f174cb08bed5e7c
This commit is contained in:
David Pursehouse
2017-09-28 07:52:11 +02:00
parent c3c9ccf29d 9a28860560
commit f119e29e85
1 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
gerrit-pgm/src/main/java/com/google/gerrit/pgm/util/LogFileCompressor.java
View File

@@ -93,17 +93,21 @@ public class LogFileCompressor implements Runnable {
@Override @Override
public void run() { public void run() {
if (!Files.isDirectory(logs_dir)) { try {
return; if (!Files.isDirectory(logs_dir)) {
} return;
try (DirectoryStream<Path> list = Files.newDirectoryStream(logs_dir)) {
for (Path entry : list) {
if (!isLive(entry) && !isCompressed(entry) && isLogFile(entry)) {
compress(entry);
}
} }
} catch (IOException e) { try (DirectoryStream<Path> list = Files.newDirectoryStream(logs_dir)) {
log.error("Error listing logs to compress in " + logs_dir, e); for (Path entry : list) {
if (!isLive(entry) && !isCompressed(entry) && isLogFile(entry)) {
compress(entry);
}
}
} catch (IOException e) {
log.error("Error listing logs to compress in " + logs_dir, e);
}
} catch (Exception e) {
log.error("Failed to compress log files: " + e.getMessage(), e);
} }
} }