diff --git a/apps/monitor/urls.py b/apps/monitor/urls.py index 986d43c13..56ec21105 100644 --- a/apps/monitor/urls.py +++ b/apps/monitor/urls.py @@ -8,16 +8,16 @@ urlpatterns = [ url(r'^app-servers?$', AppServers.as_view(), name="app_servers"), url(r'^app-times?$', AppTimes.as_view(), name="app_times"), url(r'^classifiers?$', Classifiers.as_view(), name="classifiers"), - url(r'^dbtimes?$', DbTimes.as_view(), name="db_times"), + url(r'^db-times?$', DbTimes.as_view(), name="db_times"), url(r'^errors?$', Errors.as_view(), name="errors"), url(r'^feed-counts?$', FeedCounts.as_view(), name="feed_counts"), url(r'^feeds?$', Feeds.as_view(), name="feeds"), - url(r'^load_times?$', LoadTimes.as_view(), name="load_times"), + url(r'^load-times?$', LoadTimes.as_view(), name="load_times"), url(r'^stories?$', Stories.as_view(), name="stories"), url(r'^task-codes?$', TasksCodes.as_view(), name="task_codes"), url(r'^task-pipeline?$', TasksPipeline.as_view(), name="task_pipeline"), - url(r'^task_servers?$', TasksServers.as_view(), name="task_servers"), - url(r'^task_times?$', TasksTimes.as_view(), name="task_times"), + url(r'^task-servers?$', TasksServers.as_view(), name="task_servers"), + url(r'^task-times?$', TasksTimes.as_view(), name="task_times"), url(r'^updates?$', Updates.as_view(), name="updates"), url(r'^users?$', Users.as_view(), name="users"), ] diff --git a/apps/monitor/views/newsblur_app_servers.py b/apps/monitor/views/newsblur_app_servers.py index 9b7b80dc3..5f601c63a 100755 --- a/apps/monitor/views/newsblur_app_servers.py +++ b/apps/monitor/views/newsblur_app_servers.py @@ -7,9 +7,10 @@ class AppServers(View): def get(self, request): servers = dict((("%s" % s['_id'].replace('-', ''), s['feeds']) for s in self.stats)) - servers['total'] = self.total[0]['feeds'] - return JsonResponse(servers) - + if self.total: + servers['total'] = self.total[0]['feeds'] + return JsonResponse(servers) + return JsonResponse({}) @property def stats(self): stats = settings.MONGOANALYTICSDB.nbanalytics.page_loads.aggregate([{ @@ -28,10 +29,7 @@ class AppServers(View): return list(stats) @property - def total(self): - import datetime - from django.conf import settings - + def total(self): stats = settings.MONGOANALYTICSDB.nbanalytics.page_loads.aggregate([{ "$match": { "date": { diff --git a/apps/monitor/views/newsblur_stories.py b/apps/monitor/views/newsblur_stories.py index d35c32066..f33b3384e 100755 --- a/apps/monitor/views/newsblur_stories.py +++ b/apps/monitor/views/newsblur_stories.py @@ -1,12 +1,11 @@ from django.http import JsonResponse from django.views import View from apps.rss_feeds.models import MStory, MStarredStory - +from apps.rss_feeds.models import MStory, MStarredStory + class Stories(View): - def calculate_metrics(self, request): - from apps.rss_feeds.models import MStory, MStarredStory - + def get(self, request): return JsonResponse({ 'stories': MStory.objects.count(), 'starred_stories': MStarredStory.objects.count(), diff --git a/apps/monitor/views/newsblur_tasks_codes.py b/apps/monitor/views/newsblur_tasks_codes.py index f889389af..1204bbe75 100755 --- a/apps/monitor/views/newsblur_tasks_codes.py +++ b/apps/monitor/views/newsblur_tasks_codes.py @@ -5,13 +5,13 @@ from django.views import View class TasksCodes(View): - def get(self): + def get(self, request): servers = dict((("_%s" % s['_id'], s['feeds']) for s in self.stats)) return JsonResponse(servers) @property - def stats(self, request): + def stats(self): stats = settings.MONGOANALYTICSDB.nbanalytics.feed_fetches.aggregate([{ "$match": { "date": { diff --git a/apps/monitor/views/newsblur_tasks_pipeline.py b/apps/monitor/views/newsblur_tasks_pipeline.py index 061138aff..8bd2c928b 100755 --- a/apps/monitor/views/newsblur_tasks_pipeline.py +++ b/apps/monitor/views/newsblur_tasks_pipeline.py @@ -7,7 +7,7 @@ from django.views import View class TasksPipeline(View): def get(self, request): - return self.stats + return JsonResponse(self.stats) @property def stats(self): @@ -28,5 +28,9 @@ class TasksPipeline(View): "total": {"$avg": "$total"}, }, }]) - - return list(stats)[0] + stats = list(stats) + if stats: + print(stats) + return list(stats)[0] + else: + return {} diff --git a/apps/monitor/views/newsblur_tasks_servers.py b/apps/monitor/views/newsblur_tasks_servers.py index 75b0680ae..214cdcb11 100755 --- a/apps/monitor/views/newsblur_tasks_servers.py +++ b/apps/monitor/views/newsblur_tasks_servers.py @@ -8,7 +8,10 @@ class TasksServers(View): def get(self, request): servers = dict((("%s" % s['_id'].replace('-', ''), s['feeds']) for s in self.stats)) - servers['total'] = self.total[0]['feeds'] + if self.total: + servers['total'] = self.total[0]['feeds'] + else: + servers['total'] = {} return JsonResponse(servers) @property diff --git a/apps/monitor/views/newsblur_updates.py b/apps/monitor/views/newsblur_updates.py index 90a401f0b..210ed0615 100755 --- a/apps/monitor/views/newsblur_updates.py +++ b/apps/monitor/views/newsblur_updates.py @@ -1,6 +1,7 @@ import redis from django.http import JsonResponse +from django.conf import settings from django.views import View class Updates(View):