From c82a1288fd8113c571cdd778dd8acfbcebcbca7f Mon Sep 17 00:00:00 2001 From: doomedraven Date: Mon, 27 Apr 2026 15:59:57 +0200 Subject: [PATCH] unify (#2996) * unify * Update utils/dist.py Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com> --------- Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com> --- conf/default/distributed.conf.default | 3 --- conf/default/reporting.conf.default | 3 +++ utils/dist.py | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/conf/default/distributed.conf.default b/conf/default/distributed.conf.default index f8f6f0ef4ed..9dcfc340d10 100644 --- a/conf/default/distributed.conf.default +++ b/conf/default/distributed.conf.default @@ -45,6 +45,3 @@ autodiscovery = 600 # Instances should start with following name pattern instance_name = cape-server -[gcs] -enabled = no -delete_after_upload = no diff --git a/conf/default/reporting.conf.default b/conf/default/reporting.conf.default index 9dcd41fa34d..f0361a22cc2 100644 --- a/conf/default/reporting.conf.default +++ b/conf/default/reporting.conf.default @@ -240,3 +240,6 @@ auth_by = vm # only if auth_by = json. The absolute path to your Google Cloud service account JSON key file. # This file is required for authentication. credentials_path = data/gcp-credentials.json + +# Delete local report after successful upload to GCS +delete_after_upload = no diff --git a/utils/dist.py b/utils/dist.py index d6f958d9667..e71e38bab96 100644 --- a/utils/dist.py +++ b/utils/dist.py @@ -105,8 +105,8 @@ def filter(self, record): RESTAPI_FETCH = dist_conf.distributed.get("restapi") # GCS Configuration -GCS_ENABLED = dist_conf.gcs.enabled -GCS_DELETE_AFTER_UPLOAD = dist_conf.gcs.get("delete_after_upload") +GCS_ENABLED = reporting_conf.gcs.get("enabled", False) if hasattr(reporting_conf, "gcs") else False +GCS_DELETE_AFTER_UPLOAD = reporting_conf.gcs.get("delete_after_upload", False) if hasattr(reporting_conf, "gcs") else False if GCS_ENABLED: from modules.reporting.gcs import GCSUploader