From 64f13a006412112830e1d7cc2ff71ea32cb4c1b6 Mon Sep 17 00:00:00 2001 From: Chris Hill-Scott Date: Fri, 24 Nov 2017 16:25:57 +0000 Subject: [PATCH 1/2] Add a new organisation for letter branding --- .../versions/0150_another_letter_org.py | 38 +++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 migrations/versions/0150_another_letter_org.py diff --git a/migrations/versions/0150_another_letter_org.py b/migrations/versions/0150_another_letter_org.py new file mode 100644 index 000000000..ffbb91d9a --- /dev/null +++ b/migrations/versions/0150_another_letter_org.py @@ -0,0 +1,38 @@ +"""empty message + +Revision ID: 0150_another_letter_org +Revises: 0149_add_crown_to_services +Create Date: 2017-06-29 12:44:16.815039 + +""" + +# revision identifiers, used by Alembic. +revision = '0150_another_letter_org' +down_revision = '0149_add_crown_to_services' + +from alembic import op + + +NEW_ORGANISATIONS = [ + ('006', 'DWP (Welsh)'), + ('007', 'Department for Communities'), + ('008', 'Marine Management Organisation'), +] + + +def upgrade(): + for numeric_id, name in NEW_ORGANISATIONS: + op.execute(""" + INSERT + INTO dvla_organisation + VALUES ('{}', '{}') + """.format(numeric_id, name)) + + +def downgrade(): + for numeric_id, _ in NEW_ORGANISATIONS: + op.execute(""" + DELETE + FROM dvla_organisation + WHERE id = '{}' + """.format(numeric_id)) From af1ab437be9398c13a2e371ea25ca1ad95e2bf06 Mon Sep 17 00:00:00 2001 From: Richard Chapman Date: Wed, 6 Dec 2017 09:36:23 +0000 Subject: [PATCH 2/2] Revert changes to staging for performance tests and increased rate limit - Reverted the Gunicorn worker number to 5 (this should be investigated further on a well baselined system to compare) - Enabled REDIS - Increased the rate limit to 400 req/sec as using early testing yesterday 450+ was being achieved --- app/config.py | 8 ++++---- manifest-api-staging.yml | 1 - 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/app/config.py b/app/config.py index 2294016d5..d553041e3 100644 --- a/app/config.py +++ b/app/config.py @@ -392,19 +392,19 @@ class Staging(Config): FROM_NUMBER = 'stage' API_RATE_LIMIT_ENABLED = True CHECK_PROXY_HEADER = True - REDIS_ENABLED = False + REDIS_ENABLED = True API_KEY_LIMITS = { KEY_TYPE_TEAM: { - "limit": 21000, + "limit": 24000, "interval": 60 }, KEY_TYPE_NORMAL: { - "limit": 21000, + "limit": 24000, "interval": 60 }, KEY_TYPE_TEST: { - "limit": 21000, + "limit": 24000, "interval": 60 } } diff --git a/manifest-api-staging.yml b/manifest-api-staging.yml index 05b1d420d..868d2853b 100644 --- a/manifest-api-staging.yml +++ b/manifest-api-staging.yml @@ -1,7 +1,6 @@ --- inherit: manifest-api-base.yml -command: scripts/run_app_paas.sh gunicorn -c /home/vcap/app/gunicorn_config.py --error-logfile /home/vcap/logs/gunicorn_error.log -w 6 -b 0.0.0.0:$PORT application services: - notify-aws - notify-config