set default task queue name based on ATAT environment
This commit is contained in:
parent
4b8c017d49
commit
95ad71605d
@ -98,6 +98,7 @@ def map_config(config):
|
|||||||
"default", "PERMANENT_SESSION_LIFETIME"
|
"default", "PERMANENT_SESSION_LIFETIME"
|
||||||
),
|
),
|
||||||
"RQ_REDIS_URL": config["default"]["REDIS_URI"],
|
"RQ_REDIS_URL": config["default"]["REDIS_URI"],
|
||||||
|
"RQ_QUEUES": ["atat_{}".format(ENV.lower())],
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -33,7 +33,6 @@ class BaseMailer:
|
|||||||
self.sender = sender
|
self.sender = sender
|
||||||
self.password = password
|
self.password = password
|
||||||
self.use_tls = use_tls
|
self.use_tls = use_tls
|
||||||
self.messages = []
|
|
||||||
|
|
||||||
def _message(self, recipients, subject, body):
|
def _message(self, recipients, subject, body):
|
||||||
msg = EmailMessage()
|
msg = EmailMessage()
|
||||||
@ -47,10 +46,17 @@ class BaseMailer:
|
|||||||
def send(self, recipients, subject, body):
|
def send(self, recipients, subject, body):
|
||||||
pass
|
pass
|
||||||
|
|
||||||
|
# do not collect messages by default
|
||||||
|
@property
|
||||||
|
def messages(self):
|
||||||
|
return []
|
||||||
|
|
||||||
|
|
||||||
class Mailer(BaseMailer):
|
class Mailer(BaseMailer):
|
||||||
def connection(self):
|
def connection(self):
|
||||||
return _HostConnection(self.server, self.port, self.sender, self.password, use_tls=self.use_tls)
|
return _HostConnection(
|
||||||
|
self.server, self.port, self.sender, self.password, use_tls=self.use_tls
|
||||||
|
)
|
||||||
|
|
||||||
def send(self, recipients, subject, body):
|
def send(self, recipients, subject, body):
|
||||||
message = self._message(recipients, subject, body)
|
message = self._message(recipients, subject, body)
|
||||||
|
@ -23,7 +23,6 @@ def app(request):
|
|||||||
|
|
||||||
config = make_config()
|
config = make_config()
|
||||||
config.update({"STORAGE_CONTAINER": upload_dir.name})
|
config.update({"STORAGE_CONTAINER": upload_dir.name})
|
||||||
config.update({"RQ_QUEUES": ["test"]})
|
|
||||||
|
|
||||||
_app = make_app(config)
|
_app = make_app(config)
|
||||||
|
|
||||||
|
@ -8,6 +8,7 @@ def reset_queue():
|
|||||||
yield
|
yield
|
||||||
queue.get_queue().empty()
|
queue.get_queue().empty()
|
||||||
|
|
||||||
|
|
||||||
def test_send_mail():
|
def test_send_mail():
|
||||||
assert len(queue.get_queue()) == 0
|
assert len(queue.get_queue()) == 0
|
||||||
send_mail.queue(
|
send_mail.queue(
|
||||||
|
Loading…
x
Reference in New Issue
Block a user