Skip to content

Commit fed5e82

Browse files
committed
Use get_queue function from flask-rq
1 parent d54d3c9 commit fed5e82

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

app/account/views.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
logout_user,
66
current_user
77
)
8+
from flask.ext.rq import get_queue
89
from . import account
910
from .. import db
1011
from ..email import send_async_email
@@ -18,7 +19,6 @@
1819
RequestResetPasswordForm,
1920
ResetPasswordForm
2021
)
21-
from app import redis_queue
2222

2323

2424
@account.route('/login', methods=['GET', 'POST'])
@@ -50,7 +50,7 @@ def register():
5050
db.session.commit()
5151
token = user.generate_confirmation_token()
5252
confirm_link = url_for('account.confirm', token=token, _external=True)
53-
redis_queue.enqueue(
53+
get_queue().enqueue(
5454
send_async_email,
5555
recipient=user.email,
5656
subject='Confirm Your Account',
@@ -92,7 +92,7 @@ def reset_password_request():
9292
token = user.generate_password_reset_token()
9393
reset_link = url_for('account.reset_password', token=token,
9494
_external=True)
95-
redis_queue.enqueue(
95+
get_queue().enqueue(
9696
send_async_email,
9797
recipient=user.email,
9898
subject='Reset Your Password',
@@ -157,7 +157,7 @@ def change_email_request():
157157
token = current_user.generate_email_change_token(new_email)
158158
change_email_link = url_for('account.change_email', token=token,
159159
_external=True)
160-
redis_queue.enqueue(
160+
get_queue().enqueue(
161161
send_async_email,
162162
recipient=new_email,
163163
subject='Confirm Your New Email',
@@ -192,7 +192,7 @@ def confirm_request():
192192
"""Respond to new user's request to confirm their account."""
193193
token = current_user.generate_confirmation_token()
194194
confirm_link = url_for('account.confirm', token=token, _external=True)
195-
redis_queue.enqueue(
195+
get_queue().enqueue(
196196
send_async_email,
197197
recipient=current_user.email,
198198
subject='Confirm Your Account',
@@ -256,7 +256,7 @@ def join_from_invite(user_id, token):
256256
token = new_user.generate_confirmation_token()
257257
invite_link = url_for('account.join_from_invite', user_id=user_id,
258258
token=token, _external=True)
259-
redis_queue.enqueue(
259+
get_queue().enqueue(
260260
send_async_email,
261261
recipient=new_user.email,
262262
subject='You Are Invited To Join',

app/admin/views.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
from flask import render_template, abort, redirect, flash, url_for
44
from flask.ext.login import login_required, current_user
5+
from flask.ext.rq import get_queue
56

67
from forms import (
78
ChangeUserEmailForm,
@@ -13,7 +14,6 @@
1314
from ..models import User, Role
1415
from .. import db
1516
from ..email import send_async_email
16-
from app import redis_queue
1717

1818

1919
@admin.route('/')
@@ -59,7 +59,7 @@ def invite_user():
5959
token = user.generate_confirmation_token()
6060
invite_link = url_for('account.join_from_invite', user_id=user.id,
6161
token=token, _external=True)
62-
redis_queue.enqueue(
62+
get_queue().enqueue(
6363
send_async_email,
6464
recipient=user.email,
6565
subject='You Are Invited To Join',

0 commit comments

Comments
 (0)