From 1e8a83364de3445ee75fc5e1a4485a8f729387bf Mon Sep 17 00:00:00 2001
From: Jeffrey Morgan <jmorganca@gmail.com>
Date: Tue, 6 Jan 2015 15:20:09 -0800
Subject: [PATCH] fixing metrics

---
 meteor/client/lib/metrics.js | 27 ++++++++++++++++-----------
 1 file changed, 16 insertions(+), 11 deletions(-)

diff --git a/meteor/client/lib/metrics.js b/meteor/client/lib/metrics.js
index 53fb465830..e906e4d87e 100644
--- a/meteor/client/lib/metrics.js
+++ b/meteor/client/lib/metrics.js
@@ -51,6 +51,18 @@ Metrics.trackEvent = function (name) {
   });
 };
 
+Metrics.prepareUUID = function (callback) {
+  db.get('metrics.uuid', function (err, value) {
+    if (err && err.notFound) {
+      db.put('metrics.uuid', uuid.v4(), function (err) {
+        callback();
+      });
+    } else {
+      callback();
+    }
+  });
+});
+
 Metrics.prepareTracking = function (callback) {
   db = level(Util.getMetricsDir());
   db.get('metrics.enabled', function (err, value) {
@@ -58,22 +70,15 @@ Metrics.prepareTracking = function (callback) {
       var settings = Settings.findOne();
       if (settings && settings.tracking) {
         db.put('metrics.enabled', !!settings.tracking, function(err) {
-          callback();
+          Metrics.prepareUUID(callback);
         });
       } else {
         db.put('metrics.enabled', true, function (err) {
-          callback();
+          Metrics.prepareUUID(callback);
         });
       }
+    } else {
+      Metrics.prepareUUID(callback);
     }
-    db.get('metrics.uuid', function (err, value) {
-      if (err && err.notFound) {
-        db.put('metrics.uuid', uuid.v4(), function (err) {
-          callback();
-        });
-      } else {
-        callback();
-      }
-    });
   });
 };