From 42cdcbfcce94e38735eb81079ab4d1b88f3f4af0 Mon Sep 17 00:00:00 2001 From: Alex McGraw Date: Tue, 2 Apr 2024 10:13:02 -0500 Subject: [PATCH 1/2] Update backend_pre_start.py Updated the init() function which checks if the database session is running. Prior check is deprecated. New check is updated to current SQLAlchemy package version. --- part-07-database/app/backend_pre_start.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/part-07-database/app/backend_pre_start.py b/part-07-database/app/backend_pre_start.py index 3363a41..0bbd681 100644 --- a/part-07-database/app/backend_pre_start.py +++ b/part-07-database/app/backend_pre_start.py @@ -20,8 +20,11 @@ def init() -> None: try: db = SessionLocal() - # Try to create session to check if DB is awake - db.execute("SELECT 1") + is_awake = db.is_active + if is_awake: + print("Session is awake") + else: + print("Session not awake") except Exception as e: logger.error(e) raise e From 24fb299ecf573d6e57c01ee71af55d27139e656d Mon Sep 17 00:00:00 2001 From: Alex McGraw Date: Tue, 2 Apr 2024 10:18:12 -0500 Subject: [PATCH 2/2] Fix backend_pre_start.py Continuation of backend fix. Same fix, but for subsequent parts. --- part-08-structure-and-versioning/app/backend_pre_start.py | 7 +++++-- part-09-async/app/backend_pre_start.py | 7 +++++-- part-10-jwt-auth/app/backend_pre_start.py | 7 +++++-- part-11-dependency-injection/app/backend_pre_start.py | 7 +++++-- part-12-react-frontend/backend/app/backend_pre_start.py | 7 +++++-- .../backend/app/app/backend_pre_start.py | 7 +++++-- .../backend/app/app/backend_pre_start.py | 7 +++++-- 7 files changed, 35 insertions(+), 14 deletions(-) diff --git a/part-08-structure-and-versioning/app/backend_pre_start.py b/part-08-structure-and-versioning/app/backend_pre_start.py index 3363a41..0bbd681 100644 --- a/part-08-structure-and-versioning/app/backend_pre_start.py +++ b/part-08-structure-and-versioning/app/backend_pre_start.py @@ -20,8 +20,11 @@ def init() -> None: try: db = SessionLocal() - # Try to create session to check if DB is awake - db.execute("SELECT 1") + is_awake = db.is_active + if is_awake: + print("Session is awake") + else: + print("Session not awake") except Exception as e: logger.error(e) raise e diff --git a/part-09-async/app/backend_pre_start.py b/part-09-async/app/backend_pre_start.py index 3363a41..0bbd681 100644 --- a/part-09-async/app/backend_pre_start.py +++ b/part-09-async/app/backend_pre_start.py @@ -20,8 +20,11 @@ def init() -> None: try: db = SessionLocal() - # Try to create session to check if DB is awake - db.execute("SELECT 1") + is_awake = db.is_active + if is_awake: + print("Session is awake") + else: + print("Session not awake") except Exception as e: logger.error(e) raise e diff --git a/part-10-jwt-auth/app/backend_pre_start.py b/part-10-jwt-auth/app/backend_pre_start.py index 3363a41..0bbd681 100644 --- a/part-10-jwt-auth/app/backend_pre_start.py +++ b/part-10-jwt-auth/app/backend_pre_start.py @@ -20,8 +20,11 @@ def init() -> None: try: db = SessionLocal() - # Try to create session to check if DB is awake - db.execute("SELECT 1") + is_awake = db.is_active + if is_awake: + print("Session is awake") + else: + print("Session not awake") except Exception as e: logger.error(e) raise e diff --git a/part-11-dependency-injection/app/backend_pre_start.py b/part-11-dependency-injection/app/backend_pre_start.py index 3363a41..0bbd681 100644 --- a/part-11-dependency-injection/app/backend_pre_start.py +++ b/part-11-dependency-injection/app/backend_pre_start.py @@ -20,8 +20,11 @@ def init() -> None: try: db = SessionLocal() - # Try to create session to check if DB is awake - db.execute("SELECT 1") + is_awake = db.is_active + if is_awake: + print("Session is awake") + else: + print("Session not awake") except Exception as e: logger.error(e) raise e diff --git a/part-12-react-frontend/backend/app/backend_pre_start.py b/part-12-react-frontend/backend/app/backend_pre_start.py index 3363a41..0bbd681 100644 --- a/part-12-react-frontend/backend/app/backend_pre_start.py +++ b/part-12-react-frontend/backend/app/backend_pre_start.py @@ -20,8 +20,11 @@ def init() -> None: try: db = SessionLocal() - # Try to create session to check if DB is awake - db.execute("SELECT 1") + is_awake = db.is_active + if is_awake: + print("Session is awake") + else: + print("Session not awake") except Exception as e: logger.error(e) raise e diff --git a/part-13-docker-deployment/backend/app/app/backend_pre_start.py b/part-13-docker-deployment/backend/app/app/backend_pre_start.py index 3363a41..0bbd681 100644 --- a/part-13-docker-deployment/backend/app/app/backend_pre_start.py +++ b/part-13-docker-deployment/backend/app/app/backend_pre_start.py @@ -20,8 +20,11 @@ def init() -> None: try: db = SessionLocal() - # Try to create session to check if DB is awake - db.execute("SELECT 1") + is_awake = db.is_active + if is_awake: + print("Session is awake") + else: + print("Session not awake") except Exception as e: logger.error(e) raise e diff --git a/part-14-send-email-in-background/backend/app/app/backend_pre_start.py b/part-14-send-email-in-background/backend/app/app/backend_pre_start.py index 3363a41..0bbd681 100644 --- a/part-14-send-email-in-background/backend/app/app/backend_pre_start.py +++ b/part-14-send-email-in-background/backend/app/app/backend_pre_start.py @@ -20,8 +20,11 @@ def init() -> None: try: db = SessionLocal() - # Try to create session to check if DB is awake - db.execute("SELECT 1") + is_awake = db.is_active + if is_awake: + print("Session is awake") + else: + print("Session not awake") except Exception as e: logger.error(e) raise e