darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2026-02-04 10:21:14 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2240 from alphagov/service-rate-limit-info-not-error

Browse Source 
Lower service rate limit log level to INFO
This commit is contained in:
Alexey Bezhan
2018-11-28 10:50:41 +00:00
committed by GitHub
parent 3033015754 462c8db4c3
commit e6c581b5b7
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/notifications/validators.py
View File

@@ -29,7 +29,7 @@ def check_service_over_api_rate_limit(service, api_key):
rate_limit = service.rate_limit rate_limit = service.rate_limit
interval = 60 interval = 60
if redis_store.exceeded_rate_limit(cache_key, rate_limit, interval): if redis_store.exceeded_rate_limit(cache_key, rate_limit, interval):
current_app.logger.error("service {} has been rate limited for throughput".format(service.id)) current_app.logger.info("service {} has been rate limited for throughput".format(service.id))
raise RateLimitError(rate_limit, interval, api_key.key_type) raise RateLimitError(rate_limit, interval, api_key.key_type)
@@ -41,7 +41,7 @@ def check_service_over_daily_message_limit(key_type, service):
service_stats = services_dao.fetch_todays_total_message_count(service.id) service_stats = services_dao.fetch_todays_total_message_count(service.id)
redis_store.set(cache_key, service_stats, ex=3600) redis_store.set(cache_key, service_stats, ex=3600)
if int(service_stats) >= service.message_limit: if int(service_stats) >= service.message_limit:
current_app.logger.error( current_app.logger.info(
"service {} has been rate limited for daily use sent {} limit {}".format( "service {} has been rate limited for daily use sent {} limit {}".format(
service.id, int(service_stats), service.message_limit) service.id, int(service_stats), service.message_limit)
) )

2
requirements-app.txt
View File

@@ -29,6 +29,6 @@ awscli-cwlogs>=1.4,<1.5
# Putting upgrade on hold due to v1.0.0 using sha512 instead of sha1 by default # Putting upgrade on hold due to v1.0.0 using sha512 instead of sha1 by default
itsdangerous==0.24 # pyup: <1.0.0 itsdangerous==0.24 # pyup: <1.0.0
git+https://github.com/alphagov/notifications-utils.git@30.7.0#egg=notifications-utils==30.7.0 git+https://github.com/alphagov/notifications-utils.git@30.7.1#egg=notifications-utils==30.7.1
git+https://github.com/alphagov/boto.git@2.43.0-patch3#egg=boto==2.43.0-patch3 git+https://github.com/alphagov/boto.git@2.43.0-patch3#egg=boto==2.43.0-patch3

6
requirements.txt
View File

@@ -31,7 +31,7 @@ awscli-cwlogs>=1.4,<1.5
# Putting upgrade on hold due to v1.0.0 using sha512 instead of sha1 by default # Putting upgrade on hold due to v1.0.0 using sha512 instead of sha1 by default
itsdangerous==0.24 # pyup: <1.0.0 itsdangerous==0.24 # pyup: <1.0.0
git+https://github.com/alphagov/notifications-utils.git@30.7.0#egg=notifications-utils==30.7.0 git+https://github.com/alphagov/notifications-utils.git@30.7.1#egg=notifications-utils==30.7.1
git+https://github.com/alphagov/boto.git@2.43.0-patch3#egg=boto==2.43.0-patch3 git+https://github.com/alphagov/boto.git@2.43.0-patch3#egg=boto==2.43.0-patch3
@@ -40,12 +40,12 @@ alembic==1.0.3
amqp==1.4.9 amqp==1.4.9
anyjson==0.3.3 anyjson==0.3.3
attrs==18.2.0 attrs==18.2.0
awscli==1.16.61 awscli==1.16.62
bcrypt==3.1.4 bcrypt==3.1.4
billiard==3.3.0.23 billiard==3.3.0.23
bleach==2.1.3 bleach==2.1.3
boto3==1.6.16 boto3==1.6.16
botocore==1.12.51 botocore==1.12.52
certifi==2018.10.15 certifi==2018.10.15
chardet==3.0.4 chardet==3.0.4
Click==7.0 Click==7.0