From a6eb3a208815095a5feb2ddcf637e565aeb4ead4 Mon Sep 17 00:00:00 2001 From: aovantsev Date: Thu, 9 Oct 2025 07:37:41 +0300 Subject: [PATCH] fix logger --- auth.go | 3 +-- config.go | 59 ++++++++++++++++++++++++++--------------------------- database.go | 5 ++--- main.go | 4 +--- metrics.go | 5 ++--- 5 files changed, 35 insertions(+), 41 deletions(-) diff --git a/auth.go b/auth.go index 9d18238..1951bd0 100644 --- a/auth.go +++ b/auth.go @@ -4,7 +4,6 @@ import ( "crypto/rand" "database/sql" "fmt" - "log" "net/http" "os" "strings" @@ -23,7 +22,7 @@ func InitJWT() { if secret == "" { // Generate a random secret for development secret = generateRandomSecret() - log.Println("Warning: Using generated JWT secret. Set JWT_SECRET environment variable for production.") + Logger.Println("Warning: Using generated JWT secret. Set JWT_SECRET environment variable for production.") } jwtSecret = []byte(secret) } diff --git a/config.go b/config.go index 498c21d..6d66972 100644 --- a/config.go +++ b/config.go @@ -2,7 +2,6 @@ package main import ( "fmt" - "log" "os" "strings" @@ -63,7 +62,7 @@ func loadEnvironmentFiles() { // Get environment first (from system env or default) env := getEnvironmentFromSystem() - log.Printf("🔍 Detected environment: %s", env) + Logger.Printf("🔍 Detected environment: %s", env) // Define file loading order (later files override earlier ones) files := []string{ @@ -75,12 +74,12 @@ func loadEnvironmentFiles() { for _, file := range files { if _, err := os.Stat(file); err == nil { if err := godotenv.Load(file); err != nil { - log.Printf("⚠️ Warning: Could not load %s: %v", file, err) + Logger.Printf("⚠️ Warning: Could not load %s: %v", file, err) } else { - log.Printf("✅ Loaded: %s", file) + Logger.Printf("✅ Loaded: %s", file) } } else { - log.Printf("❌ Not found: %s", file) + Logger.Printf("❌ Not found: %s", file) } } } @@ -112,7 +111,7 @@ func getEnvironment() Environment { case "production", "prod": return Production default: - log.Printf("⚠️ Unknown environment '%s', defaulting to development", env) + Logger.Printf("⚠️ Unknown environment '%s', defaulting to development", env) return Development } } @@ -169,7 +168,7 @@ func getEnv(key, defaultValue string) string { func getRequiredEnv(key string) string { value := os.Getenv(key) if value == "" { - log.Fatalf("❌ Required environment variable %s is not set", key) + Logger.Fatalf("❌ Required environment variable %s is not set", key) } return value } @@ -177,29 +176,29 @@ func getRequiredEnv(key string) string { // logConfig logs configuration (without sensitive data) func logConfig(config *Config) { // Environment banner - log.Printf("") - log.Printf("╔══════════════════════════════════════════════════════════════╗") - log.Printf("║ COUNTER APPLICATION ║") - log.Printf("║ ║") - log.Printf("║ 🌍 ENVIRONMENT: %-15s ║", strings.ToUpper(string(config.Environment))) - log.Printf("║ 🚀 MODE: %-20s ║", config.GinMode) - log.Printf("║ 🔧 DEBUG: %-20s ║", fmt.Sprintf("%t", config.Debug)) - log.Printf("║ 📊 LOG LEVEL: %-15s ║", config.LogLevel) - log.Printf("║ 🌐 PORT: %-20s ║", config.Port) - log.Printf("║ 📈 METRICS PORT: %-15s ║", config.MetricsPort) - log.Printf("║ 📝 LOG DIR: %-20s ║", config.LogDir) - log.Printf("║ 📦 LOG VOLUME: %-18s ║", config.LogVolume) - log.Printf("║ ║") - log.Printf("║ 📁 Configuration Files Loaded: ║") - log.Printf("║ • .env (base configuration) ║") - log.Printf("║ • .env.%s (environment-specific) ║", config.Environment) - log.Printf("║ ║") - log.Printf("║ 🔐 Security: ║") - log.Printf("║ • Database: %s ║", maskDatabaseURL(config.DatabaseURL)) - log.Printf("║ • JWT Secret: %s ║", maskSecret(config.JWTSecret)) - log.Printf("║ ║") - log.Printf("╚══════════════════════════════════════════════════════════════╝") - log.Printf("") + Logger.Printf("") + Logger.Printf("╔══════════════════════════════════════════════════════════════╗") + Logger.Printf("║ COUNTER APPLICATION ║") + Logger.Printf("║ ║") + Logger.Printf("║ 🌍 ENVIRONMENT: %-15s ║", strings.ToUpper(string(config.Environment))) + Logger.Printf("║ 🚀 MODE: %-20s ║", config.GinMode) + Logger.Printf("║ 🔧 DEBUG: %-20s ║", fmt.Sprintf("%t", config.Debug)) + Logger.Printf("║ 📊 LOG LEVEL: %-15s ║", config.LogLevel) + Logger.Printf("║ 🌐 PORT: %-20s ║", config.Port) + Logger.Printf("║ 📈 METRICS PORT: %-15s ║", config.MetricsPort) + Logger.Printf("║ 📝 LOG DIR: %-20s ║", config.LogDir) + Logger.Printf("║ 📦 LOG VOLUME: %-18s ║", config.LogVolume) + Logger.Printf("║ ║") + Logger.Printf("║ 📁 Configuration Files Loaded: ║") + Logger.Printf("║ • .env (base configuration) ║") + Logger.Printf("║ • .env.%s (environment-specific) ║", config.Environment) + Logger.Printf("║ ║") + Logger.Printf("║ 🔐 Security: ║") + Logger.Printf("║ • Database: %s ║", maskDatabaseURL(config.DatabaseURL)) + Logger.Printf("║ • JWT Secret: %s ║", maskSecret(config.JWTSecret)) + Logger.Printf("║ ║") + Logger.Printf("╚══════════════════════════════════════════════════════════════╝") + Logger.Printf("") } // maskDatabaseURL masks sensitive parts of database URL diff --git a/database.go b/database.go index b2369f0..2c1f55d 100644 --- a/database.go +++ b/database.go @@ -3,7 +3,6 @@ package main import ( "database/sql" "fmt" - "log" "os" _ "github.com/lib/pq" @@ -41,7 +40,7 @@ func initDBWithURL(dbURL string) error { return fmt.Errorf("failed to ping database: %w", err) } - log.Println("✅ Database connection established successfully") + Logger.Println("✅ Database connection established successfully") return nil } @@ -82,7 +81,7 @@ func CreateTables() error { } } - log.Println("✅ Database tables created successfully") + Logger.Println("✅ Database tables created successfully") return nil } diff --git a/main.go b/main.go index bc2c65c..1eafcef 100644 --- a/main.go +++ b/main.go @@ -1,8 +1,6 @@ package main import ( - "log" - "github.com/gin-contrib/cors" "github.com/gin-gonic/gin" "github.com/sirupsen/logrus" @@ -14,7 +12,7 @@ func main() { // Initialize structured logger if err := InitLogger(config); err != nil { - log.Fatal("Failed to initialize logger:", err) + Logger.Fatal("Failed to initialize logger:", err) } // Set Gin mode based on configuration diff --git a/metrics.go b/metrics.go index 6adc8ff..642b799 100644 --- a/metrics.go +++ b/metrics.go @@ -1,7 +1,6 @@ package main import ( - "log" "net/http" "strconv" "strings" @@ -90,9 +89,9 @@ func StartMetricsServer(port string) { } go func() { - log.Printf("📈 Metrics server starting on http://localhost:%s/metrics", port) + Logger.Printf("📈 Metrics server starting on http://localhost:%s/metrics", port) if err := server.ListenAndServe(); err != nil && err != http.ErrServerClosed { - log.Printf("❌ Metrics server failed to start: %v", err) + Logger.Printf("❌ Metrics server failed to start: %v", err) } }() }