chore(logging): 完成后端日志审计与结构化迁移
- 将高密度服务与处理器日志迁移到新日志系统(LegacyPrintf/结构化日志) - 增加 stdlog bridge 与兼容测试,保留旧日志捕获能力 - 将 OpenAI 断流告警改为结构化 Warn 并改造对应测试为 sink 捕获 - 补齐后端相关文件 logger 引用并通过全量 go test
This commit is contained in:
@@ -7,12 +7,12 @@ import (
|
||||
"database/sql"
|
||||
"encoding/hex"
|
||||
"fmt"
|
||||
"log"
|
||||
"os"
|
||||
"strconv"
|
||||
"strings"
|
||||
"time"
|
||||
|
||||
"github.com/Wei-Shaw/sub2api/internal/pkg/logger"
|
||||
"github.com/Wei-Shaw/sub2api/internal/repository"
|
||||
"github.com/Wei-Shaw/sub2api/internal/service"
|
||||
|
||||
@@ -168,7 +168,7 @@ func TestDatabaseConnection(cfg *DatabaseConfig) error {
|
||||
return
|
||||
}
|
||||
if err := db.Close(); err != nil {
|
||||
log.Printf("failed to close postgres connection: %v", err)
|
||||
logger.LegacyPrintf("setup", "failed to close postgres connection: %v", err)
|
||||
}
|
||||
}()
|
||||
|
||||
@@ -195,12 +195,12 @@ func TestDatabaseConnection(cfg *DatabaseConfig) error {
|
||||
if err != nil {
|
||||
return fmt.Errorf("failed to create database '%s': %w", cfg.DBName, err)
|
||||
}
|
||||
log.Printf("Database '%s' created successfully", cfg.DBName)
|
||||
logger.LegacyPrintf("setup", "Database '%s' created successfully", cfg.DBName)
|
||||
}
|
||||
|
||||
// Now connect to the target database to verify
|
||||
if err := db.Close(); err != nil {
|
||||
log.Printf("failed to close postgres connection: %v", err)
|
||||
logger.LegacyPrintf("setup", "failed to close postgres connection: %v", err)
|
||||
}
|
||||
db = nil
|
||||
|
||||
@@ -216,7 +216,7 @@ func TestDatabaseConnection(cfg *DatabaseConfig) error {
|
||||
|
||||
defer func() {
|
||||
if err := targetDB.Close(); err != nil {
|
||||
log.Printf("failed to close postgres connection: %v", err)
|
||||
logger.LegacyPrintf("setup", "failed to close postgres connection: %v", err)
|
||||
}
|
||||
}()
|
||||
|
||||
@@ -248,7 +248,7 @@ func TestRedisConnection(cfg *RedisConfig) error {
|
||||
rdb := redis.NewClient(opts)
|
||||
defer func() {
|
||||
if err := rdb.Close(); err != nil {
|
||||
log.Printf("failed to close redis client: %v", err)
|
||||
logger.LegacyPrintf("setup", "failed to close redis client: %v", err)
|
||||
}
|
||||
}()
|
||||
|
||||
@@ -276,7 +276,7 @@ func Install(cfg *SetupConfig) error {
|
||||
return fmt.Errorf("failed to generate jwt secret: %w", err)
|
||||
}
|
||||
cfg.JWT.Secret = secret
|
||||
log.Println("Warning: JWT secret auto-generated. Consider setting a fixed secret for production.")
|
||||
logger.LegacyPrintf("setup", "%s", "Warning: JWT secret auto-generated. Consider setting a fixed secret for production.")
|
||||
}
|
||||
|
||||
// Test connections
|
||||
@@ -331,7 +331,7 @@ func initializeDatabase(cfg *SetupConfig) error {
|
||||
|
||||
defer func() {
|
||||
if err := db.Close(); err != nil {
|
||||
log.Printf("failed to close postgres connection: %v", err)
|
||||
logger.LegacyPrintf("setup", "failed to close postgres connection: %v", err)
|
||||
}
|
||||
}()
|
||||
|
||||
@@ -354,7 +354,7 @@ func createAdminUser(cfg *SetupConfig) (bool, string, error) {
|
||||
|
||||
defer func() {
|
||||
if err := db.Close(); err != nil {
|
||||
log.Printf("failed to close postgres connection: %v", err)
|
||||
logger.LegacyPrintf("setup", "failed to close postgres connection: %v", err)
|
||||
}
|
||||
}()
|
||||
|
||||
@@ -524,8 +524,8 @@ func getEnvIntOrDefault(key string, defaultValue int) int {
|
||||
// AutoSetupFromEnv performs automatic setup using environment variables
|
||||
// This is designed for Docker deployment where all config is passed via env vars
|
||||
func AutoSetupFromEnv() error {
|
||||
log.Println("Auto setup enabled, configuring from environment variables...")
|
||||
log.Printf("Data directory: %s", GetDataDir())
|
||||
logger.LegacyPrintf("setup", "%s", "Auto setup enabled, configuring from environment variables...")
|
||||
logger.LegacyPrintf("setup", "Data directory: %s", GetDataDir())
|
||||
|
||||
// Get timezone from TZ or TIMEZONE env var (TZ is standard for Docker)
|
||||
tz := getEnvOrDefault("TZ", "")
|
||||
@@ -573,62 +573,62 @@ func AutoSetupFromEnv() error {
|
||||
return fmt.Errorf("failed to generate jwt secret: %w", err)
|
||||
}
|
||||
cfg.JWT.Secret = secret
|
||||
log.Println("Warning: JWT secret auto-generated. Consider setting a fixed secret for production.")
|
||||
logger.LegacyPrintf("setup", "%s", "Warning: JWT secret auto-generated. Consider setting a fixed secret for production.")
|
||||
}
|
||||
|
||||
// Test database connection
|
||||
log.Println("Testing database connection...")
|
||||
logger.LegacyPrintf("setup", "%s", "Testing database connection...")
|
||||
if err := TestDatabaseConnection(&cfg.Database); err != nil {
|
||||
return fmt.Errorf("database connection failed: %w", err)
|
||||
}
|
||||
log.Println("Database connection successful")
|
||||
logger.LegacyPrintf("setup", "%s", "Database connection successful")
|
||||
|
||||
// Test Redis connection
|
||||
log.Println("Testing Redis connection...")
|
||||
logger.LegacyPrintf("setup", "%s", "Testing Redis connection...")
|
||||
if err := TestRedisConnection(&cfg.Redis); err != nil {
|
||||
return fmt.Errorf("redis connection failed: %w", err)
|
||||
}
|
||||
log.Println("Redis connection successful")
|
||||
logger.LegacyPrintf("setup", "%s", "Redis connection successful")
|
||||
|
||||
// Initialize database
|
||||
log.Println("Initializing database...")
|
||||
logger.LegacyPrintf("setup", "%s", "Initializing database...")
|
||||
if err := initializeDatabase(cfg); err != nil {
|
||||
return fmt.Errorf("database initialization failed: %w", err)
|
||||
}
|
||||
log.Println("Database initialized successfully")
|
||||
logger.LegacyPrintf("setup", "%s", "Database initialized successfully")
|
||||
|
||||
// Create admin user
|
||||
log.Println("Creating admin user...")
|
||||
logger.LegacyPrintf("setup", "%s", "Creating admin user...")
|
||||
created, reason, err := createAdminUser(cfg)
|
||||
if err != nil {
|
||||
return fmt.Errorf("admin user creation failed: %w", err)
|
||||
}
|
||||
if created {
|
||||
log.Printf("Admin user created: %s", cfg.Admin.Email)
|
||||
logger.LegacyPrintf("setup", "Admin user created: %s", cfg.Admin.Email)
|
||||
} else {
|
||||
switch reason {
|
||||
case adminBootstrapReasonAdminExists:
|
||||
log.Println("Admin user already exists, skipping admin bootstrap")
|
||||
logger.LegacyPrintf("setup", "%s", "Admin user already exists, skipping admin bootstrap")
|
||||
case adminBootstrapReasonUsersExistWithoutAdmin:
|
||||
log.Println("Database already has user data; skipping auto admin bootstrap to avoid password overwrite")
|
||||
logger.LegacyPrintf("setup", "%s", "Database already has user data; skipping auto admin bootstrap to avoid password overwrite")
|
||||
default:
|
||||
log.Println("Admin bootstrap skipped")
|
||||
logger.LegacyPrintf("setup", "%s", "Admin bootstrap skipped")
|
||||
}
|
||||
}
|
||||
|
||||
// Write config file
|
||||
log.Println("Writing configuration file...")
|
||||
logger.LegacyPrintf("setup", "%s", "Writing configuration file...")
|
||||
if err := writeConfigFile(cfg); err != nil {
|
||||
return fmt.Errorf("config file creation failed: %w", err)
|
||||
}
|
||||
log.Println("Configuration file created")
|
||||
logger.LegacyPrintf("setup", "%s", "Configuration file created")
|
||||
|
||||
// Create installation lock file
|
||||
if err := createInstallLock(); err != nil {
|
||||
return fmt.Errorf("failed to create install lock: %w", err)
|
||||
}
|
||||
log.Println("Installation lock created")
|
||||
logger.LegacyPrintf("setup", "%s", "Installation lock created")
|
||||
|
||||
log.Println("Auto setup completed successfully!")
|
||||
logger.LegacyPrintf("setup", "%s", "Auto setup completed successfully!")
|
||||
return nil
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user