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

move updating into the dao fn

Browse Source 
this helps manage the transaction by keeping it inside one function in the dao,
so after the function completes you know that the transaction has been released
and concurrent processing can resume
This commit is contained in:
Leo Hemsted
2016-10-07 12:28:42 +01:00
parent 897ad6a957
commit 16dd16c026
2 changed files with 24 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
app/celery/scheduled_tasks.py
View File

@@ -1,4 +1,4 @@
from datetime import datetime, timedelta
from datetime import datetime
from flask import current_app
from sqlalchemy.exc import SQLAlchemyError
@@ -6,12 +6,11 @@ from sqlalchemy.exc import SQLAlchemyError
from app.aws import s3
from app import notify_celery
from app.dao.invited_user_dao import delete_invitations_created_more_than_two_days_ago
from app.dao.jobs_dao import dao_get_scheduled_jobs, dao_update_job, dao_get_jobs_older_than
from app.dao.jobs_dao import dao_set_scheduled_jobs_to_pending, dao_get_jobs_older_than
from app.dao.notifications_dao import (delete_notifications_created_more_than_a_week_ago,
dao_timeout_notifications)
from app.dao.users_dao import delete_codes_older_created_more_than_a_day_ago
from app.statsd_decorators import statsd
from app.models import JOB_STATUS_PENDING
from app.celery.tasks import process_job
@@ -27,24 +26,14 @@ def remove_csv_files():
@notify_celery.task(name="run-scheduled-jobs")
@statsd(namespace="tasks")
def run_scheduled_jobs():
from app import db
try:
jobs = dao_get_scheduled_jobs()
for job in jobs:
job.job_status = JOB_STATUS_PENDING
from time import sleep
sleep(1)
print('SCHEDULING' + str(job.id))
# dao_update_job(job)
# process_job.apply_async([str(job.id)], queue="process-job")
for job in dao_set_scheduled_jobs_to_pending():
process_job.apply_async([str(job.id)], queue="process-job")
current_app.logger.info(
"Job ID {} added to process job queue".format(job.id)
"Job ID {} added to process job queue".format(job.id)
)
db.session.add_all(jobs)
db.session.commit()
except SQLAlchemyError as e:
current_app.logger.exception("Failed to run scheduled jobs", e)
db.session.rollback()
raise