demo seed change 4
This commit is contained in:
@@ -9,6 +9,7 @@ import logging
|
||||
import logging.config
|
||||
import os
|
||||
import sys
|
||||
import resource
|
||||
from typing import Dict, Any
|
||||
|
||||
def setup_logging(service_name: str, log_level: str = "INFO",
|
||||
@@ -23,16 +24,37 @@ def setup_logging(service_name: str, log_level: str = "INFO",
|
||||
enable_file: Whether to enable file logging
|
||||
"""
|
||||
|
||||
# Check file descriptor limits
|
||||
try:
|
||||
soft_limit, hard_limit = resource.getrlimit(resource.RLIMIT_NOFILE)
|
||||
if soft_limit < 1024:
|
||||
print(f"Warning: Low file descriptor limit ({soft_limit}). Consider increasing with 'ulimit -n'")
|
||||
if soft_limit < 256:
|
||||
print("Critical: File descriptor limit is very low. File logging may fail.")
|
||||
enable_file = False
|
||||
except Exception:
|
||||
# resource module might not be available on all platforms
|
||||
pass
|
||||
|
||||
# Create logs directory if it doesn't exist and file logging is enabled
|
||||
log_dir = "/var/log"
|
||||
if enable_file:
|
||||
try:
|
||||
os.makedirs(log_dir, exist_ok=True)
|
||||
except PermissionError:
|
||||
# First try to create/write to /var/log
|
||||
test_file = os.path.join(log_dir, f".{service_name}_test")
|
||||
with open(test_file, 'w') as f:
|
||||
f.write("test")
|
||||
os.remove(test_file)
|
||||
except (PermissionError, OSError):
|
||||
# Fallback to local directory if can't write to /var/log
|
||||
log_dir = "./logs"
|
||||
os.makedirs(log_dir, exist_ok=True)
|
||||
print(f"Warning: Could not write to /var/log, using {log_dir}")
|
||||
|
||||
try:
|
||||
os.makedirs(log_dir, exist_ok=True)
|
||||
except Exception as e:
|
||||
print(f"Warning: Could not create log directory {log_dir}: {e}")
|
||||
enable_file = False # Disable file logging if we can't create directory
|
||||
|
||||
# Define formatters
|
||||
formatters = {
|
||||
@@ -70,14 +92,25 @@ def setup_logging(service_name: str, log_level: str = "INFO",
|
||||
|
||||
# Add file handler if enabled
|
||||
if enable_file:
|
||||
handlers["file"] = {
|
||||
"class": "logging.FileHandler",
|
||||
"level": log_level,
|
||||
"formatter": "detailed",
|
||||
"filename": f"{log_dir}/{service_name}.log",
|
||||
"mode": "a",
|
||||
"encoding": "utf-8"
|
||||
}
|
||||
try:
|
||||
# Test if we can actually write to the log file location
|
||||
test_filename = f"{log_dir}/{service_name}.log"
|
||||
test_dir = os.path.dirname(test_filename)
|
||||
if not os.access(test_dir, os.W_OK):
|
||||
print(f"Warning: Cannot write to log directory {test_dir}, disabling file logging")
|
||||
enable_file = False
|
||||
else:
|
||||
handlers["file"] = {
|
||||
"class": "logging.FileHandler",
|
||||
"level": log_level,
|
||||
"formatter": "detailed",
|
||||
"filename": test_filename,
|
||||
"mode": "a",
|
||||
"encoding": "utf-8"
|
||||
}
|
||||
except Exception as e:
|
||||
print(f"Warning: Could not configure file handler: {e}")
|
||||
enable_file = False
|
||||
|
||||
# Add logstash handler if in production
|
||||
logstash_host = os.getenv("LOGSTASH_HOST")
|
||||
@@ -141,6 +174,10 @@ def setup_logging(service_name: str, log_level: str = "INFO",
|
||||
logging.config.dictConfig(config)
|
||||
logger = logging.getLogger(__name__)
|
||||
logger.info(f"Logging configured for {service_name} at level {log_level}")
|
||||
if enable_file:
|
||||
logger.info(f"File logging enabled at {log_dir}/{service_name}.log")
|
||||
else:
|
||||
logger.info("File logging disabled")
|
||||
except Exception as e:
|
||||
# Fallback to basic logging if configuration fails
|
||||
logging.basicConfig(
|
||||
@@ -151,4 +188,10 @@ def setup_logging(service_name: str, log_level: str = "INFO",
|
||||
logger = logging.getLogger(__name__)
|
||||
logger.error(f"Failed to configure advanced logging for {service_name}: {e}")
|
||||
logger.info(f"Using basic logging configuration for {service_name}")
|
||||
|
||||
# Additional debugging for file handler issues
|
||||
if "file" in str(e).lower() or "handler" in str(e).lower():
|
||||
logger.error(f"File handler configuration failed. Check permissions for {log_dir}")
|
||||
logger.error(f"Current working directory: {os.getcwd()}")
|
||||
logger.error(f"Attempting to write to: {log_dir}/{service_name}.log")
|
||||
|
||||
|
||||
Reference in New Issue
Block a user