jan/openreplay
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feat(chalice): upgraded dependencies

Browse source 
feat(crons): changed triggers
This commit is contained in:
Taha Yassine Kraiem 2022-12-30 11:36:20 +01:00
parent 9d7c89198d
commit c6ebeeba7c
8 changed files with 33 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
api/requirements-alerts.txt
View file

@ -1,6 +1,6 @@
requests==2.28.1
urllib3==1.26.12
boto3==1.26.39
boto3==1.26.40
pyjwt==2.6.0
psycopg2-binary==2.9.5
elasticsearch==8.5.3

2
api/requirements.txt
View file

@ -1,6 +1,6 @@
requests==2.28.1
urllib3==1.26.12
boto3==1.26.39
boto3==1.26.40
pyjwt==2.6.0
psycopg2-binary==2.9.5
elasticsearch==8.5.3

12
api/routers/crons/core_dynamic_crons.py
View file

@ -1,3 +1,6 @@
from apscheduler.triggers.cron import CronTrigger
from apscheduler.triggers.interval import IntervalTrigger
from chalicelib.core import telemetry
from chalicelib.core import weekly_report, jobs
@ -15,7 +18,10 @@ async def telemetry_cron() -> None:
cron_jobs = [
{"func": telemetry_cron, "trigger": "cron", "day_of_week": "*"},
{"func": run_scheduled_jobs, "trigger": "interval", "seconds": 60, "misfire_grace_time": 20},
{"func": weekly_report2, "trigger": "cron", "day_of_week": "mon", "hour": 5, "misfire_grace_time": 60 * 60}
{"func": telemetry_cron, "trigger": CronTrigger(day_of_week="*"),
"misfire_grace_time": 60 * 60, "max_instances": 1},
{"func": run_scheduled_jobs, "trigger": IntervalTrigger(minutes=1),
"misfire_grace_time": 20, "max_instances": 1},
{"func": weekly_report2, "trigger": CronTrigger(day_of_week="mon", hour=5),
"misfire_grace_time": 60 * 60, "max_instances": 1}
]

2
ee/api/requirements-alerts.txt
View file

@ -1,6 +1,6 @@
requests==2.28.1
urllib3==1.26.12
boto3==1.26.39
boto3==1.26.40
pyjwt==2.6.0
psycopg2-binary==2.9.5
elasticsearch==8.5.3

9
ee/api/requirements-crons.txt
View file

@ -1,6 +1,6 @@
requests==2.28.1
urllib3==1.26.12
boto3==1.26.39
boto3==1.26.40
pyjwt==2.6.0
psycopg2-binary==2.9.5
elasticsearch==8.5.3
@ -8,11 +8,6 @@ jira==3.4.1
fastapi==0.88.0
uvicorn[standard]==0.20.0
python-decouple==3.6
pydantic[email]==1.10.2
apscheduler==3.9.1.post1
clickhouse-driver==0.2.5
python-multipart==0.0.5
clickhouse-driver==0.2.5

2
ee/api/requirements.txt
View file

@ -1,6 +1,6 @@
requests==2.28.1
urllib3==1.26.12
boto3==1.26.39
boto3==1.26.40
pyjwt==2.6.0
psycopg2-binary==2.9.5
elasticsearch==8.5.3

21
ee/api/routers/crons/core_dynamic_crons.py
View file

@ -1,8 +1,11 @@
from chalicelib.core import telemetry, unlock
from chalicelib.core import jobs
from chalicelib.core import weekly_report as weekly_report_script
from apscheduler.triggers.cron import CronTrigger
from apscheduler.triggers.interval import IntervalTrigger
from decouple import config
from chalicelib.core import jobs
from chalicelib.core import telemetry, unlock
from chalicelib.core import weekly_report as weekly_report_script
async def run_scheduled_jobs() -> None:
jobs.execute_jobs()
@ -26,11 +29,13 @@ cron_jobs = [
{"func": unlock_cron, "trigger": "cron", "hour": "*"},
]
SINGLE_CRONS = [{"func": telemetry_cron, "trigger": "cron", "day_of_week": "*"},
{"func": run_scheduled_jobs, "trigger": "interval", "seconds": 60, "misfire_grace_time": 20},
{"func": weekly_report, "trigger": "cron", "day_of_week": "mon", "hour": 5,
"misfire_grace_time": 60 * 60}
]
SINGLE_CRONS = [{"func": telemetry_cron, "trigger": CronTrigger(day_of_week="*"),
"misfire_grace_time": 60 * 60, "max_instances": 1},
{"func": run_scheduled_jobs, "trigger": IntervalTrigger(minutes=60),
"misfire_grace_time": 20, "max_instances": 1},
{"func": weekly_report, "trigger": CronTrigger(day_of_week="mon", hour=5),
"misfire_grace_time": 60 * 60, "max_instances": 1}
]
if config("LOCAL_CRONS", default=False, cast=bool):
cron_jobs += SINGLE_CRONS

8
ee/api/routers/crons/ee_crons.py
View file

@ -1,10 +1,12 @@
from apscheduler.triggers.interval import IntervalTrigger
from chalicelib.utils import events_queue
def pg_events_queue() -> None:
async def pg_events_queue() -> None:
events_queue.global_queue.force_flush()
ee_cron_jobs = [
{"func": pg_events_queue, "trigger": "interval", "seconds": 60*5, "misfire_grace_time": 20},
]
{"func": pg_events_queue, "trigger": IntervalTrigger(minutes=5), "misfire_grace_time": 20, "max_instances": 1},
]