Merge branch 'master' into add-template-version

app/__init__.py

@@ -1,9 +1,10 @@
 import uuid
 import os
-from flask import request, url_for
+from flask import request, url_for, g
 from flask import Flask, _request_ctx_stack
 from flask.ext.sqlalchemy import SQLAlchemy
 from flask_marshmallow import Marshmallow
+from monotonic import monotonic
 from werkzeug.local import LocalProxy
 from notifications_utils import logging
 from app.celery.celery import NotifyCelery
@@ -11,6 +12,7 @@ from app.clients import Clients
 from app.clients.sms.mmg import MMGClient
 from app.clients.sms.twilio import TwilioClient
 from app.clients.sms.firetext import FiretextClient
+from app.clients.sms.loadtesting import LoadtestingClient
 from app.clients.email.aws_ses import AwsSesClient
 from app.encryption import Encryption
 
@@ -22,6 +24,7 @@ ma = Marshmallow()
 notify_celery = NotifyCelery()
 twilio_client = TwilioClient()
 firetext_client = FiretextClient()
+loadtest_client = LoadtestingClient()
 mmg_client = MMGClient()
 aws_ses_client = AwsSesClient()
 encryption = Encryption()
@@ -46,11 +49,12 @@ def create_app(app_name=None):
     logging.init_app(application)
     twilio_client.init_app(application)
     firetext_client.init_app(application)
+    loadtest_client.init_app(application)
     mmg_client.init_app(application.config)
     aws_ses_client.init_app(application.config['AWS_REGION'])
     notify_celery.init_app(application)
     encryption.init_app(application)
-    clients.init_app(sms_clients=[firetext_client, mmg_client], email_clients=[aws_ses_client])
+    clients.init_app(sms_clients=[firetext_client, mmg_client, loadtest_client], email_clients=[aws_ses_client])
 
     from app.service.rest import service as service_blueprint
     from app.user.rest import user as user_blueprint
@@ -99,6 +103,10 @@ def init_app(app):
             if error:
                 return error
 
+    @app.before_request
+    def record_start_time():
+        g.start = monotonic()
+
     @app.after_request
     def after_request(response):
         response.headers.add('Access-Control-Allow-Origin', '*')

app/clients/sms/loadtesting.py

@@ -0,0 +1,18 @@
+import logging
+from app.clients.sms.firetext import (
+    FiretextClient
+)
+
+logger = logging.getLogger(__name__)
+
+
+class LoadtestingClient(FiretextClient):
+    '''
+    Loadtest sms client.
+    '''
+
+    def init_app(self, config, *args, **kwargs):
+        super(FiretextClient, self).__init__(*args, **kwargs)
+        self.api_key = config.config.get('LOADTESTING_API_KEY')
+        self.from_number = config.config.get('LOADTESTING_NUMBER')
+        self.name = 'loadtesting'