Index: appengine/sheriff_o_matic/alerts.py |
diff --git a/appengine/sheriff_o_matic/alerts.py b/appengine/sheriff_o_matic/alerts.py |
index 354dd157c9457be7a273afcf69194cdd688c44d2..42a67233d02104efb76eec2f23b6267ff62aca76 100644 |
--- a/appengine/sheriff_o_matic/alerts.py |
+++ b/appengine/sheriff_o_matic/alerts.py |
@@ -4,10 +4,10 @@ |
import contextlib |
import datetime |
-import datetime_encoder |
import json |
import logging |
import urllib |
+import utils |
import webapp2 |
import zlib |
@@ -15,6 +15,7 @@ import cloudstorage as gcs |
from google.appengine.api import app_identity |
from google.appengine.api import memcache |
+from google.appengine.api import modules |
agable
2015/08/12 22:18:08
Unused import?
|
from google.appengine.api import users |
from google.appengine.datastore import datastore_query |
from google.appengine.ext import ndb |
@@ -76,7 +77,7 @@ class AlertsHandler(webapp2.RequestHandler): |
@staticmethod |
def generate_json_dump(alerts): |
- return json.dumps(alerts, cls=datetime_encoder.DateTimeEncoder, indent=1) |
+ return json.dumps(alerts, cls=utils.DateTimeEncoder, indent=1) |
@staticmethod |
def get_last_datastore(alerts_type): |
@@ -124,6 +125,7 @@ class AlertsHandler(webapp2.RequestHandler): |
return False |
def get(self): |
+ utils.increment_monarch('alerts') |
data = self.get_from_memcache() or self.get_from_datastore() |
if data: |
self.send_json_data(data) |
@@ -195,6 +197,7 @@ class AlertsHandler(webapp2.RequestHandler): |
class NewAlertsHandler(AlertsHandler): |
# pylint: disable=arguments-differ |
def get(self, tree): |
+ utils.increment_monarch('api/v1/alerts') |
self.ALERT_TYPE = 'new-alerts/%s' % tree |
super(NewAlertsHandler, self).get() |