Update throttling

observatorycontrolsystem · Jun 22, 2019 · 9c3cc67 · 9c3cc67
1 parent c09a16c
commit 9c3cc67
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/observation_portal/accounts/models.py b/observation_portal/accounts/models.py
@@ -70,7 +70,7 @@ def api_quota(self):
         hours as well as the maximum allowed by DRF's throttling framework'''
         hits = cache.get('throttle_user_{0}'.format(self.user.id))
         used = len(hits) if hits else 0
-        allowed = settings.REST_FRAMEWORK['DEFAULT_THROTTLE_RATES']['user']
+        allowed = 'unlimited'  # placeholder in case we ever reimplement a stricter throttle policy
         return {'used': used, 'allowed': allowed}
 
     def __str__(self):

diff --git a/observation_portal/settings.py b/observation_portal/settings.py
@@ -224,14 +224,12 @@
     'DEFAULT_PAGINATION_CLASS': 'rest_framework.pagination.LimitOffsetPagination',
     'PAGE_SIZE': 10,
     'DEFAULT_THROTTLE_CLASSES': (
-        'observation_portal.accounts.throttling.AllowStaffUserRateThrottle',
         'rest_framework.throttling.ScopedRateThrottle',
     ),
     'DEFAULT_THROTTLE_RATES': {
-        'user': '5000/day',
-        'requestgroups.cancel': '1000/day',
-        'requestgroups.create': '2500/day',
-        'requestgroups.validate': '10000/day'
+        'requestgroups.cancel': '2000/day',
+        'requestgroups.create': '5000/day',
+        'requestgroups.validate': '20000/day'
     }
 }