metrics_daemon: store persistent counters in /var/lib, not /var/log.
BUG=chromium:356781
TEST=manual
Change-Id: I7d36876347bdbbe329e24adf3345c2ade97be5fe
Reviewed-on: https://chromium-review.googlesource.com/195310
Reviewed-by: Luigi Semenzato <semenzato@chromium.org>
Commit-Queue: Luigi Semenzato <semenzato@chromium.org>
Tested-by: Luigi Semenzato <semenzato@chromium.org>
diff --git a/init/metrics_daemon.conf b/init/metrics_daemon.conf
index 68edff4..9b1e2a5 100644
--- a/init/metrics_daemon.conf
+++ b/init/metrics_daemon.conf
@@ -11,5 +11,10 @@
stop on stopping system-services
respawn
+pre-start script
+ # Make the directory, but don't die on error. Let someone else complain.
+ mkdir -p /var/lib/metrics || :
+end script
+
expect fork
exec metrics_daemon
diff --git a/persistent_integer.cc b/persistent_integer.cc
index 658c9d3..d4ef8b2 100644
--- a/persistent_integer.cc
+++ b/persistent_integer.cc
@@ -11,10 +11,14 @@
#include "metrics_library.h"
-namespace chromeos_metrics {
+namespace {
// The directory for the persistent storage.
-const char* const kBackingFilesDirectory = "/var/log/metrics/";
+const char kBackingFilesDirectory[] = "/var/lib/metrics/";
+
+}
+
+namespace chromeos_metrics {
// Static class member instantiation.
bool PersistentInteger::testing_ = false;
