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

feat(chalice): fixing jobs execution

Browse source
This commit is contained in:
Taha Yassine Kraiem 2023-04-12 14:36:51 +01:00 • committed by rjshrjndrn
parent cea886b619
commit 59905075c6
4 changed files with 15 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
api/chalicelib/core/jobs.py
View file

@ -1,6 +1,6 @@
from chalicelib.utils import pg_client, helper
from chalicelib.utils.TimeUTC import TimeUTC
from chalicelib.core import sessions, sessions_mobs
from chalicelib.core import sessions, sessions_mobs, sessions_devtool
class Actions:
@ -128,17 +128,15 @@ def execute_jobs():
print(f"Deleting {len(session_ids)} sessions")
sessions.delete_sessions_by_session_ids(session_ids)
sessions_mobs.delete_mobs(session_ids=session_ids, project_id=job["projectId"])
sessions_devtool.delete_mobs(session_ids=session_ids, project_id=job["projectId"])
else:
raise Exception(f"The action '{job['action']}' not supported.")
job["status"] = JobStatus.COMPLETED
print(f"Job completed {job['jobId']}")
except Exception as e:
print("-----")
print(e)
print("-----")
job["status"] = JobStatus.FAILED
job["error"] = str(e)
job["errors"] = str(e)
print(f"Job failed {job['jobId']}")
update(job["jobId"], job)

3
api/chalicelib/core/sessions.py
View file

@ -1073,9 +1073,6 @@ def get_session_ids_by_user_ids(project_id, user_ids):
WHERE project_id = %(project_id)s
AND user_id IN %(userId)s;""",
{"project_id": project_id, "userId": tuple(user_ids)})
print("----------")
print(query)
print("----------")
cur.execute(query=query)
ids = cur.fetchall()
return [s["session_id"] for s in ids]

6
api/chalicelib/core/sessions_devtool.py
View file

@ -24,3 +24,9 @@ def get_urls(session_id, project_id, check_existence: bool = True):
ExpiresIn=config("PRESIGNED_URL_EXPIRATION", cast=int, default=900)
))
return results
def delete_mobs(project_id, session_ids):
for session_id in session_ids:
for k in __get_devtools_keys(project_id=project_id, session_id=session_id):
s3.schedule_for_deletion(config("sessions_bucket"), k)

6
ee/api/chalicelib/core/sessions_devtool.py
View file

@ -31,3 +31,9 @@ def get_urls(session_id, project_id, context: schemas_ee.CurrentContext, check_e
ExpiresIn=config("PRESIGNED_URL_EXPIRATION", cast=int, default=900)
))
return results
def delete_mobs(project_id, session_ids):
for session_id in session_ids:
for k in __get_devtools_keys(project_id=project_id, session_id=session_id):
s3.schedule_for_deletion(config("sessions_bucket"), k)