Merge branch 'global-ip-block' into dev

2021-01-23 23:01:53 -05:00
parent ba9a716913 c0d02732e7
commit 6e48a3eac7
5 changed files with 26 additions and 5 deletions
--- a/shynet/analytics/tasks.py
+++ b/shynet/analytics/tasks.py
@@ -116,7 +116,7 @@ def ingress_request(
                return
            session = Session.objects.create(
                service=service,
-                ip=ip if service.collect_ips else None,
+                ip=ip if service.collect_ips and not settings.BLOCK_ALL_IPS else None,
                user_agent=user_agent,
                identifier=identifier.strip(),
                browser=ua.browser.family or "",