darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2026-01-31 15:15:38 -05:00
Code Issues Packages Projects Releases Wiki Activity

After a comment from @idavidmcdonald, I asked myself why are not creating the task to upload the pdf and update the notification.

Browse Source 
The assumption was that S3 would throw an exception if the object was uploaded twice. That's not the case the default behaviour is that if a file already exists it will be overwritten. So it is completely safe to run the task from the alert.

It can also mean that we don't need to wait 4hours 15 minutes. Shall I decease the amount of time before restarting the task?
This commit is contained in:
Rebecca Law
2019-11-19 16:04:21 +00:00
parent c42420c329
commit ac4f0e8027
3 changed files with 15 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
app/celery/scheduled_tasks.py
View File

@@ -14,6 +14,7 @@ from app.celery.tasks import (
get_recipient_csv_and_template,
process_row
)
from app.celery.letters_pdf_tasks import create_letters_pdf
from app.config import QueueNames, TaskNames
from app.dao.invited_org_user_dao import delete_org_invitations_created_more_than_two_days_ago
from app.dao.invited_user_dao import delete_invitations_created_more_than_two_days_ago
@@ -196,18 +197,13 @@ def replay_created_notifications():
if len(letters) > 0:
msg = "{} letters were created four hours and 15 minutes ago, " \
"but do not have an updated_at timestamp or billable units. " \
"It is likely you need to run the " \
"app.celery.letters_pdf_tasks.create_letters_pdf task again with " \
"the notification id.\n {}".format(len(letters),
[x.id for x in letters])
"\n Creating app.celery.letters_pdf_tasks.create_letters tasks to upload letter to S3 " \
"and update notifications for the following notification ids: " \
"\n {}".format(len(letters), [x.id for x in letters])
current_app.logger.info(msg)
if current_app.config['NOTIFY_ENVIRONMENT'] in ['live', 'production', 'test']:
zendesk_client.create_ticket(
subject="[{}] Letters still in created status might be missing from S3".format(
current_app.config['NOTIFY_ENVIRONMENT']),
message=msg,
ticket_type=zendesk_client.TYPE_INCIDENT
)
for letter in letters:
create_letters_pdf.apply_async([letter.id], queue=QueueNames.LETTERS)
@notify_celery.task(name='check-precompiled-letter-state')

4
app/dao/notifications_dao.py
View File

@@ -710,11 +710,11 @@ def dao_old_letters_with_created_status():
def letters_missing_from_sending_bucket(seconds_to_subtract):
older_than_date = datetime.utcnow() - timedelta(seconds=seconds_to_subtract)
# We expect letters to have a `created` status, updated_at timestamp and billable units greater than zero.
notifications = Notification.query.filter(
Notification.billable_units == 0,
Notification.updated_at == None, # noqa
Notification.status == NOTIFICATION_CREATED,
Notification.billable_units == 0,
Notification.created_at <= older_than_date,
Notification.notification_type == LETTER_TYPE,
Notification.key_type == KEY_TYPE_NORMAL