commit d1c394c55ad74f2a99e98583222f6dda39010763
author TreeHugger Robot <treehugger-gerrit@google.com> Fri Feb 14 02:12:58 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Feb 14 02:12:58 2020 +0000
tree 3b53cca2f6202aff8de3cbe4c1288aebb4700ab8
parent ac6a498ece85bb1034ccaee6b5bff758c7a8ed0f
parent 981069af8d23c21268f5fde6a82aa40924d77762

Merge "Fix issue where train files would not be deleted past TTL or when over file number limit."

cmds/statsd/src/storage/StorageManager.cpp

diff --git a/cmds/statsd/src/storage/StorageManager.cpp b/cmds/statsd/src/storage/StorageManager.cpp
index 1bac19e..4899b4a 100644
--- a/cmds/statsd/src/storage/StorageManager.cpp
+++ b/cmds/statsd/src/storage/StorageManager.cpp
@@ -690,14 +690,16 @@
         if (name[0] == '.') continue;
 
         FileName output;
+        string file_name;
         if (parseTimestampOnly) {
+            file_name = StringPrintf("%s/%s", path, name);
             output.mTimestampSec = StrToInt64(strtok(name, "_"));
             output.mIsHistory = false;
         } else {
             parseFileName(name, &output);
+            file_name = output.getFullFileName(path);
         }
         if (output.mTimestampSec == -1) continue;
-        string file_name = output.getFullFileName(path);
 
         // Check for timestamp and delete if it's too old.
         long fileAge = nowSec - output.mTimestampSec;