Skip to content
Open
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
10 changes: 9 additions & 1 deletion server_main.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,15 @@
import argparse
import logging
import os
import sys
from pathlib import Path

# Fix Windows stdout encoding before any logging
if sys.platform == 'win32':
import io
sys.stdout = io.TextIOWrapper(sys.stdout.buffer, encoding='utf-8', errors='replace')
sys.stderr = io.TextIOWrapper(sys.stderr.buffer, encoding='utf-8', errors='replace')

from runtime.bootstrap.schema import ensure_schema_registry_populated
from server.app import app

Expand Down Expand Up @@ -52,7 +60,7 @@ def main():
level=getattr(logging, args.log_level.upper()),
format="%(asctime)s - %(name)s - %(levelname)s - %(message)s",
handlers=[
logging.FileHandler(log_dir / "server.log"),
logging.FileHandler(log_dir / "server.log", encoding='utf-8'),
logging.StreamHandler()
]
)
Expand Down
17 changes: 11 additions & 6 deletions utils/logger.py
Original file line number Diff line number Diff line change
Expand Up @@ -104,12 +104,17 @@ def add_log(self, level: LogLevel, message: str = None, node_id: str = None,

# Log to console if enabled
if self.log_to_console:
print(f"[{timestamp}] [{level.value}] "
f"{f'Node {node_id} - ' if node_id else ''}"
f"{f'Event {event_type} - ' if event_type else ''}"
f"{message} "
f"{f'Details: {details} ' if details else ''}"
f"{f'Duration: {duration}' if duration else ''}")
try:
print(f"[{timestamp}] [{level.value}] "
f"{f'Node {node_id} - ' if node_id else ''}"
f"{f'Event {event_type} - ' if event_type else ''}"
f"{message} "
f"{f'Details: {details} ' if details else ''}"
f"{f'Duration: {duration}' if duration else ''}")
except UnicodeEncodeError:
# Fallback for Windows console with GBK encoding
fallback_msg = f"[{timestamp}] [{level.value}] {message}"
print(fallback_msg.encode('utf-8', errors='replace').decode('utf-8', errors='replace'))

# Log using structured logger if enabled
if self.use_structured_logging and self.structured_logger:
Expand Down
3 changes: 2 additions & 1 deletion utils/structured_logger.py
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,10 @@ def __init__(self, name: str, log_level: LogLevel = LogLevel.INFO, log_file: str
# Ensure log directory exists
log_path = Path(log_file)
log_path.parent.mkdir(parents=True, exist_ok=True)
handler = logging.FileHandler(log_file)
handler = logging.FileHandler(log_file, encoding='utf-8')
else:
handler = logging.StreamHandler(sys.stdout)
handler.terminator = '' # Prevent newline issues

handler.setFormatter(formatter)
self.logger.addHandler(handler)
Expand Down