Remove celery_queues from config.

Removed unused endpoint.
This commit is contained in:
Rebecca Law
2016-03-02 13:15:23 +00:00
parent f1cf4eddd5
commit 6a739d5ec9
3 changed files with 2 additions and 44 deletions

View File

@@ -152,38 +152,6 @@ def send_user_email_code(user_id):
return jsonify({}), 204 return jsonify({}), 204
# TODO: Remove this method once the admin app has stopped using it.
@user.route('/<int:user_id>/code', methods=['POST'])
def send_user_code(user_id):
user_to_send_to = get_model_users(user_id=user_id)
if not user_to_send_to:
return jsonify(result="error", message="not found"), 404
verify_code, errors = old_request_verify_code_schema.load(request.get_json())
if errors:
return jsonify(result="error", message=errors), 400
from app.dao.users_dao import create_secret_code
secret_code = create_secret_code()
create_user_code(user_to_send_to, secret_code, verify_code.get('code_type'))
if verify_code.get('code_type') == 'sms':
mobile = user_to_send_to.mobile_number if verify_code.get('to', None) is None else verify_code.get('to')
verification_message = {'to': mobile, 'secret_code': secret_code}
send_sms_code.apply_async([encryption.encrypt(verification_message)], queue='sms-code')
elif verify_code.get('code_type') == 'email':
email = user_to_send_to.email_address if verify_code.get('to', None) is None else verify_code.get('to')
verification_message = {
'to_address': email,
'from_address': current_app.config['VERIFY_CODE_FROM_EMAIL_ADDRESS'],
'subject': 'Verification code',
'body': secret_code}
send_email_code.apply_async([encryption.encrypt(verification_message)], queue='email-code')
else:
abort(500)
return jsonify({}), 204
@user.route('/<int:user_id>', methods=['GET']) @user.route('/<int:user_id>', methods=['GET'])
@user.route('', methods=['GET']) @user.route('', methods=['GET'])
def get_user(user_id=None): def get_user(user_id=None):

View File

@@ -29,7 +29,7 @@ class Config(object):
BROKER_URL = 'sqs://' BROKER_URL = 'sqs://'
BROKER_TRANSPORT_OPTIONS = { BROKER_TRANSPORT_OPTIONS = {
'region': 'eu-west-1', 'region': 'eu-west-1',
'polling_interval': 1, # 1 second 'polling_interval': 120, # 1 second
'visibility_timeout': 60, # 60 seconds 'visibility_timeout': 60, # 60 seconds
'queue_name_prefix': os.environ['NOTIFICATION_QUEUE_PREFIX']+'-' 'queue_name_prefix': os.environ['NOTIFICATION_QUEUE_PREFIX']+'-'
} }
@@ -49,16 +49,6 @@ class Config(object):
TWILIO_NUMBER = os.getenv('TWILIO_NUMBER') TWILIO_NUMBER = os.getenv('TWILIO_NUMBER')
FIRETEXT_NUMBER = os.getenv('FIRETEXT_NUMBER') FIRETEXT_NUMBER = os.getenv('FIRETEXT_NUMBER')
FIRETEXT_API_KEY = os.getenv("FIRETEXT_API_KEY") FIRETEXT_API_KEY = os.getenv("FIRETEXT_API_KEY")
CELERY_QUEUES = [
Queue('sms', Exchange('default'), routing_key='default'),
Queue('email', Exchange('default'), routing_key='default'),
Queue('sms-code', Exchange('default'), routing_key='default'),
Queue('email-code', Exchange('default'), routing_key='default'),
Queue('process-job', Exchange('default'), routing_key='default'),
Queue('bulk-sms', Exchange('default'), routing_key='default'),
Queue('bulk-email', Exchange('default'), routing_key='default'),
Queue('email-invited-user', Exchange('default'), routing_key='default')
]
class Development(Config): class Development(Config):

View File

@@ -3,4 +3,4 @@
set -e set -e
source environment.sh source environment.sh
celery -A run_celery.notify_celery worker --loglevel=INFO --concurrency=4 celery -A run_celery.notify_celery worker --loglevel=INFO --concurrency=4 -Q sms,sms-code,email-code,email,process-job,bulk-sms,bulk-email,email-invited-user