Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 10 additions & 9 deletions hexactf/factory.py
Original file line number Diff line number Diff line change
Expand Up @@ -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"""
Expand All @@ -22,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()
Expand Down Expand Up @@ -65,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):
Expand All @@ -74,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,
Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down