From b9ef4422fbe0f74d850981e9001a31f7633e3159 Mon Sep 17 00:00:00 2001 From: "ry.yamafuji" Date: Sat, 6 Dec 2025 05:38:21 +0900 Subject: [PATCH] =?UTF-8?q?Cloud=20Function=20=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/deploy_to_gcp.yml | 5 ----- src/requirements.txt | 3 ++- src/utils/custom_logger.py | 18 ++++++++++-------- terraform/provider.tf | 2 +- 4 files changed, 13 insertions(+), 15 deletions(-) diff --git a/.github/workflows/deploy_to_gcp.yml b/.github/workflows/deploy_to_gcp.yml index faccd9e..0b1d1ee 100644 --- a/.github/workflows/deploy_to_gcp.yml +++ b/.github/workflows/deploy_to_gcp.yml @@ -45,11 +45,6 @@ jobs: export GOOGLE_APPLICATION_CREDENTIALS="$HOME/sa.json" ./scripts/deploy/init_terraform.sh - - name: Exec Container Image Push to Artifact Registry - run: | - export GOOGLE_APPLICATION_CREDENTIALS="$HOME/sa.json" - ./scripts/deploy/build_image_to_gar.sh - - name: Exec Terraform plan shell run: | export GOOGLE_APPLICATION_CREDENTIALS="$HOME/sa.json" diff --git a/src/requirements.txt b/src/requirements.txt index ead9a25..6ec7538 100644 --- a/src/requirements.txt +++ b/src/requirements.txt @@ -1 +1,2 @@ -functions-framework==3.* \ No newline at end of file +functions-framework==3.* +google-cloud-logging diff --git a/src/utils/custom_logger.py b/src/utils/custom_logger.py index 80186ed..7c5541e 100644 --- a/src/utils/custom_logger.py +++ b/src/utils/custom_logger.py @@ -11,18 +11,20 @@ class CoogelCustomLogger(): self.logger = logging.getLogger(name) self.logger.setLevel(logging.INFO) - handler = logging.StreamHandler() - handler.setLevel(logging.INFO) - # メッセージのみ(フォーマットなし) - formatter = logging.Formatter("%(message)s") - handler.setFormatter(formatter) - if not self.logger.handlers: + handler = logging.StreamHandler() + handler.setLevel(logging.INFO) + # メッセージのみ(フォーマットなし) + formatter = logging.Formatter("%(message)s") + handler.setFormatter(formatter) self.logger.addHandler(handler) + # 親ロガー(root)への伝播を止める → 二重出力防止 + self.logger.propagate = False + def _log(self, message,level="INFO",**fields): payload = { - "serverity": level, + "severity": level, "message": f"{message}", **fields } @@ -39,7 +41,7 @@ class CoogelCustomLogger(): def exception(self, message, **fields): payload = { - "serverity": "ERROR", + "severity": "ERROR", "message": f"{message}", **fields } diff --git a/terraform/provider.tf b/terraform/provider.tf index 218805c..47ede87 100644 --- a/terraform/provider.tf +++ b/terraform/provider.tf @@ -1,5 +1,5 @@ terraform { - backend "gcs" {} + # backend "gcs" {} } # Google Providerの設定