Merge pull request #301 from shankari/release_v_11

Fixes to the production code made directly to the server
e-mission · Jul 2, 2016 · ff5a495 · ff5a495
2 parents 4f8c206 + d16ca1e
commit ff5a495
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/bin/remotePush.py b/bin/remotePush.py
@@ -3,13 +3,10 @@
 
 config_data = json.load(open('conf/net/ext_service/parse.json'))
 
-interval = sys.argv[1]
+interval = "interval_%s" % sys.argv[1]
 print "pushing for interval %s" % interval
 
 silent_push_msg = {
-   "where": {
-     "deviceType": "ios"
-   },
    "channels": [
      interval
    ],

diff --git a/emission/net/usercache/builtin_usercache_handler.py b/emission/net/usercache/builtin_usercache_handler.py
@@ -76,7 +76,10 @@ def moveToLongTerm(self):
             except Exception as e:
                 logging.exception("Backtrace time")
                 logging.warn("Got error %s while saving entry %s -> %s"% (e, entry, unified_entry))
-                ts.insert_error(entry_doc)
+                try:
+                    ts.insert_error(entry_doc)
+                except pymongo.errors.DuplicateKeyError as e:
+                    logging.info("document already present in error timeseries, skipping since read-only")
         logging.debug("Deleting all entries for query %s" % time_query)
         uc.clearProcessedMessages(time_query)
         esp.mark_usercache_done(self.user_id, last_ts_processed)