Merge branch 'hotfix/stop-logging-keen'

Author: felliott

mfr/core/remote_logging.py

@@ -14,7 +14,7 @@
 
 async def log_analytics(request, metrics, is_error=False):
     """Send events to Keen describing the action that occurred."""
-    if settings.KEEN_PRIVATE_PROJECT_ID is None:
+    if not settings.KEEN_ENABLE_LOGGING:
         return
 
     keen_payload = copy.deepcopy(metrics)
@@ -78,11 +78,17 @@ async def log_analytics(request, metrics, is_error=False):
 
     # send the private payload
     private_collection = 'mfr_errors' if is_error else 'mfr_action'
-    await _send_to_keen(keen_payload, private_collection, settings.KEEN_PRIVATE_PROJECT_ID,
-                        settings.KEEN_PRIVATE_WRITE_KEY, keen_payload['handler']['type'],
-                        domain='private')
-
-    if keen_payload['handler']['type'] != 'render' or file_metadata is None or is_error:
+    if ((is_error and settings.KEEN_PRIVATE_LOG_ERRORS) or settings.KEEN_PRIVATE_LOG_VIEWS):
+        await _send_to_keen(keen_payload, private_collection, settings.KEEN_PRIVATE_PROJECT_ID,
+                            settings.KEEN_PRIVATE_WRITE_KEY, keen_payload['handler']['type'],
+                            domain='private')
+
+    if (
+        keen_payload['handler']['type'] != 'render' or
+        file_metadata is None or
+        is_error or
+        not settings.KEEN_PUBLIC_LOG_VIEWS
+    ):
         return
 
     # build and ship the public file stats payload

mfr/server/settings.py

@@ -43,11 +43,15 @@
 keen_config = analytics_config.child('KEEN')
 KEEN_API_BASE_URL = keen_config.get('API_BASE_URL', 'https://api.keen.io')
 KEEN_API_VERSION = keen_config.get('API_VERSION', '3.0')
+KEEN_ENABLE_LOGGING = keen_config.get_bool('ENABLE_LOGGING', True)
 
 keen_private_config = keen_config.child('PRIVATE')
 KEEN_PRIVATE_PROJECT_ID = keen_private_config.get_nullable('PROJECT_ID', None)
 KEEN_PRIVATE_WRITE_KEY = keen_private_config.get_nullable('WRITE_KEY', None)
+KEEN_PRIVATE_LOG_VIEWS = keen_private_config.get_bool('LOG_VIEWS', True)
+KEEN_PRIVATE_LOG_ERRORS = keen_private_config.get_bool('LOG_ERRORS', True)
 
 keen_public_config = keen_config.child('PUBLIC')
 KEEN_PUBLIC_PROJECT_ID = keen_public_config.get_nullable('PROJECT_ID', None)
 KEEN_PUBLIC_WRITE_KEY = keen_public_config.get_nullable('WRITE_KEY', None)
+KEEN_PUBLIC_LOG_VIEWS = keen_public_config.get_bool('LOG_VIEWS', True)