diff options
| author | valerijf <valerijf@oath.com> | 2017-09-05 16:43:45 +0200 |
|---|---|---|
| committer | valerijf <valerijf@oath.com> | 2017-09-05 16:43:45 +0200 |
| commit | 8910a869322ef5e6864be407f66c2fbc5782bb8b (patch) | |
| tree | 5a518ae4198a3c5232ef9b498b1f6c2faf7dfbd0 | |
| parent | 287ecb8b493314893c2d372c41fb1470d5e74eab (diff) | |
Fix remove old logs paths
| -rw-r--r-- | node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/StorageMaintainer.java | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/StorageMaintainer.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/StorageMaintainer.java index 37467d2338b..91660c8226d 100644 --- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/StorageMaintainer.java +++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/StorageMaintainer.java @@ -187,17 +187,19 @@ public class StorageMaintainer { maintainerExecutor.addJob("delete-files") .withArgument("basePath", path) .withArgument("maxAgeSeconds", Duration.ofDays(3).getSeconds()) - .withArgument("fileNameRegex", ".*\\.log\\..+") - .withArgument("recursive", false); - - maintainerExecutor.addJob("delete-files") - .withArgument("basePath", path) - .withArgument("maxAgeSeconds", Duration.ofDays(3).getSeconds()) - .withArgument("fileNameRegex", ".*QueryAccessLog.*") + .withArgument("fileNameRegex", ".*\\.log.+") .withArgument("recursive", false); } } + Path qrsDir = environment.pathInNodeAdminFromPathInNode( + containerName, getDefaults().underVespaHome("logs/vespa/qrs")); + maintainerExecutor.addJob("delete-files") + .withArgument("basePath", qrsDir) + .withArgument("maxAgeSeconds", Duration.ofDays(3).getSeconds()) + .withArgument("fileNameRegex", ".*QueryAccessLog.*") + .withArgument("recursive", false); + Path logArchiveDir = environment.pathInNodeAdminFromPathInNode( containerName, getDefaults().underVespaHome("logs/vespa/logarchive")); maintainerExecutor.addJob("delete-files") |