From c1ce43000ff7e899a04d25b0a17114e53153246d Mon Sep 17 00:00:00 2001 From: S0okJu Date: Thu, 1 May 2025 14:05:11 +0900 Subject: [PATCH 1/3] =?UTF-8?q?[Hotfix]=20Loki=20unbound-error=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hexactf/factory.py | 1 + 1 file changed, 1 insertion(+) diff --git a/hexactf/factory.py b/hexactf/factory.py index 7e8b7c8..fda461d 100644 --- a/hexactf/factory.py +++ b/hexactf/factory.py @@ -11,6 +11,7 @@ from hexactf.exceptions.base_exceptions import CustomBaseException from hexactf.extensions.kafka.handler import MessageHandler from hexactf.extensions_manager import kafka_consumer, db +from hexactf.monitoring.loki_logger import FlaskLokiLogger def start_kafka_consumer(app): """Start Kafka consumer in a separate thread""" From 9f6b1be0389adc107f850baaff0e80b1f9dad68b Mon Sep 17 00:00:00 2001 From: S0okJu Date: Thu, 1 May 2025 16:06:16 +0900 Subject: [PATCH 2/3] =?UTF-8?q?[Hotfix]=20Loki=20Handler=20=EC=9E=84?= =?UTF-8?q?=EC=8B=9C=20=EC=A3=BC=EC=84=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hexactf/factory.py | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/hexactf/factory.py b/hexactf/factory.py index fda461d..28c4ba4 100644 --- a/hexactf/factory.py +++ b/hexactf/factory.py @@ -23,17 +23,17 @@ def __init__(self, config_class: Type[Config] = Config): self.app = Flask(__name__) self.app.config.from_object(config_class) - self.logger = FlaskLokiLogger(app_name="challenge-api", loki_url=self.app.config['LOKI_URL']).logger + # self.logger = FlaskLokiLogger(app_name="challenge-api", loki_url=self.app.config['LOKI_URL']).logger - if os.getenv("TEST_MODE") != "true": - from hexactf.monitoring.loki_logger import FlaskLokiLogger - self.logger = FlaskLokiLogger(app_name="challenge-api", loki_url=self.app.config['LOKI_URL']).logger - else: - self.logger = self.app.logger # Use Flask default logger + # if os.getenv("TEST_MODE") != "true": + # from hexactf.monitoring.loki_logger import FlaskLokiLogger + # self.logger = FlaskLokiLogger(app_name="challenge-api", loki_url=self.app.config['LOKI_URL']).logger + # else: + # self.logger = self.app.logger # Use Flask default logger # 초기 설정 self._init_extensions() - self._setup_middleware() + # self._setup_middleware() self._register_error_handlers() self._setup_blueprints() # self._init_metrics_collector() @@ -66,7 +66,7 @@ def start_timer(): @self.app.after_request def log_request(response): total_time = (datetime.now() - g.start).total_seconds() - self._log_request(response, total_time) + # self._log_request(response, total_time) return response def _register_error_handlers(self): @@ -75,7 +75,7 @@ def _register_error_handlers(self): @self.app.errorhandler(CustomBaseException) def handle_challenge_error(error): print(f"[DEBUG] error: {error.__dict__}", file=sys.stderr) - self._log_error(error) + # self._log_error(error) response = { 'error': { 'code': error.error_type.value, From 6c0b029667fd41d42120c539818a9558ee9a48fa Mon Sep 17 00:00:00 2001 From: S0okJu Date: Thu, 1 May 2025 16:07:17 +0900 Subject: [PATCH 3/3] [Hotfix] requirements.txt pymysql version update 1.1.1 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 4b5be8c..7a84812 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,7 +2,7 @@ Flask==2.3.3 Flask-SQLAlchemy==3.0.2 SQLAlchemy==2.0.20 -pymysql==1.0.3 +pymysql>=1.1.1 mariadb>=1.0.11 kubernetes==26.1.0