diff --git a/api/chalicelib/core/jobs.py b/api/chalicelib/core/jobs.py index 0c78859be..bc5ce81ab 100644 --- a/api/chalicelib/core/jobs.py +++ b/api/chalicelib/core/jobs.py @@ -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) diff --git a/api/chalicelib/core/sessions.py b/api/chalicelib/core/sessions.py index 9edaa280c..7de8253da 100644 --- a/api/chalicelib/core/sessions.py +++ b/api/chalicelib/core/sessions.py @@ -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] diff --git a/api/chalicelib/core/sessions_devtool.py b/api/chalicelib/core/sessions_devtool.py index 6aab5a5e2..50af2bb39 100644 --- a/api/chalicelib/core/sessions_devtool.py +++ b/api/chalicelib/core/sessions_devtool.py @@ -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) diff --git a/ee/api/chalicelib/core/sessions_devtool.py b/ee/api/chalicelib/core/sessions_devtool.py index 9961df360..198466f65 100644 --- a/ee/api/chalicelib/core/sessions_devtool.py +++ b/ee/api/chalicelib/core/sessions_devtool.py @@ -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)