From 42230f65e5ae80f292388ca00ce90e73f59346dc Mon Sep 17 00:00:00 2001
From: Jason Calabrese <jason@cbrese.com>
Date: Wed, 1 Apr 2015 00:22:18 -0700
Subject: [PATCH 1/4] use new sysTime field

if sysTime and type fields are available use them for the upsert query
add index for sysTime
---
 lib/entries.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/entries.js b/lib/entries.js
index abd019897..77d5a4542 100644
--- a/lib/entries.js
+++ b/lib/entries.js
@@ -113,7 +113,8 @@ function storage(name, storage, pushover) {
           totalCreated = 0;
 
       docs.forEach(function(doc) {
-        collection.update(doc, doc, {upsert: true}, function (err, created) {
+        var query  = (doc.sysTime && doc.type) ? {sysTime: doc.sysTime, type: doc.type} : doc;
+        collection.update(query, doc, {upsert: true}, function (err, created) {
           firstErr = firstErr || err;
           if (++totalCreated === numDocs) {
             fn(firstErr, docs);
@@ -199,7 +200,7 @@ function storage(name, storage, pushover) {
   return api;
 }
 
-var indexedFields = [ 'date', 'type', 'sgv' ];
+var indexedFields = [ 'date', 'type', 'sgv', 'sysTime' ];
 storage.indexedFields = indexedFields;
 
 // expose module

From f3a3d0dd48d54874d7ddf5fd1d3f41c180656d18 Mon Sep 17 00:00:00 2001
From: Jason Calabrese <jason@cbrese.com>
Date: Wed, 1 Apr 2015 22:16:44 -0700
Subject: [PATCH 2/4] use readENV for MQTT_MONITOR

---
 env.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/env.js b/env.js
index acb4f64e2..a189580eb 100644
--- a/env.js
+++ b/env.js
@@ -32,7 +32,7 @@ function config ( ) {
   }
   env.version = software.version;
   env.name = software.name;
-  env.MQTT_MONITOR = process.env.MQTT_MONITOR || null;
+  env.MQTT_MONITOR = readENV('MQTT_MONITOR', null);
   env.DISPLAY_UNITS = readENV('DISPLAY_UNITS', 'mg/dl');
   env.PORT = readENV('PORT', 1337);
   env.mongo = readENV('MONGO_CONNECTION') || readENV('MONGO') || readENV('MONGOLAB_URI');

From fff52300ab680d6aeb43681ba70b00477f522ee2 Mon Sep 17 00:00:00 2001
From: Jason Calabrese <jason@cbrese.com>
Date: Wed, 1 Apr 2015 22:39:57 -0700
Subject: [PATCH 3/4] support for heroku COMIT_HASH env var if GIT HEAD isn't
 found

---
 env.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/env.js b/env.js
index a189580eb..c8be09fb2 100644
--- a/env.js
+++ b/env.js
@@ -27,7 +27,7 @@ function config ( ) {
   } else {
     git.short(function record_git_head (head) {
       console.log("GIT HEAD", head);
-      env.head = head || readENV("SCM_COMMIT_ID", "");
+      env.head = head || readENV('SCM_COMMIT_ID') || readENV('COMMIT_HASH', '');
     });
   }
   env.version = software.version;

From 396e2af14218bd531f520faad3eac4647125e6da Mon Sep 17 00:00:00 2001
From: Jason Calabrese <jason@cbrese.com>
Date: Wed, 1 Apr 2015 22:58:24 -0700
Subject: [PATCH 4/4] use env.mqtt_client_id

---
 lib/mqtt.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/mqtt.js b/lib/mqtt.js
index b67095fe6..71e68e213 100644
--- a/lib/mqtt.js
+++ b/lib/mqtt.js
@@ -101,7 +101,7 @@ function configure(env, core, devicestatus) {
     var opts = {
         encoding: 'binary',
         clean: false,
-        clientId: env.head
+        clientId: env.mqtt_client_id
     };
     var client = mqtt.connect(uri, opts);
     var downloads = downloader();