From 79cdf83c9e1690852d74766e5813afe395ebd24c Mon Sep 17 00:00:00 2001 From: Amritanshu Date: Wed, 16 Sep 2026 06:53:38 +0000 Subject: [PATCH] Healthcheck in OCI session date format --- ansible/roles/brewman/tasks/main.yaml | 9 ++++++--- brewman/brewman/routers/reports/__init__.py | 15 ++++++++++++--- 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/ansible/roles/brewman/tasks/main.yaml b/ansible/roles/brewman/tasks/main.yaml index 6f4b54e5..78d10b40 100644 --- a/ansible/roles/brewman/tasks/main.yaml +++ b/ansible/roles/brewman/tasks/main.yaml @@ -32,6 +32,9 @@ env_file: "/var/lib/{{ host_directory }}/.env" networks: - name: "brewman_{{ instance }}_net" - # volumes: - # - "/var/lib/{{ host_directory }}/frontend:/frontend" - + healthcheck: + test: ["CMD-SHELL", "curl -fsS http://localhost/health || kill -s 15 1"] + interval: 30s + timeout: 5s + start_period: 30s + retries: 3 diff --git a/brewman/brewman/routers/reports/__init__.py b/brewman/brewman/routers/reports/__init__.py index 8e70ef3c..580f574f 100644 --- a/brewman/brewman/routers/reports/__init__.py +++ b/brewman/brewman/routers/reports/__init__.py @@ -14,7 +14,10 @@ def report_start_date(request: Request, s: str | date | None = None) -> date: return d if "start" not in session: session["start"] = get_first_day(date.today()).isoformat() - return date.fromisoformat(session["start"]) + try: + return date.fromisoformat(session["start"]) + except ValueError: + return get_first_day(date.today()) def report_finish_date(request: Request, f: str | date | None = None) -> date: @@ -28,7 +31,10 @@ def report_finish_date(request: Request, f: str | date | None = None) -> date: return d if "finish" not in session: session["finish"] = get_last_day(date.today()).isoformat() - return date.fromisoformat(session["finish"]) + try: + return date.fromisoformat(session["finish"]) + except ValueError: + return get_last_day(date.today()) def report_date(request: Request, d: str | date | None = None) -> date: @@ -42,7 +48,10 @@ def report_date(request: Request, d: str | date | None = None) -> date: return parsed_date if "date" not in session: session["date"] = get_last_day(date.today()).isoformat() - return date.fromisoformat(session["date"]) + try: + return date.fromisoformat(session["date"]) + except ValueError: + return get_last_day(date.today()) def get_first_day(dt: date, d_years: int = 0, d_months: int = 0) -> date: