fix: sécuriser shutdown, config par défaut et reconnexion socket
Co-authored-by: aider (openrouter/openai/gpt-5.3-codex) <aider@aider.chat>
This commit is contained in:
@ -3,7 +3,6 @@ package logging
|
||||
|
||||
import (
|
||||
"encoding/json"
|
||||
"fmt"
|
||||
"log"
|
||||
"os"
|
||||
"strings"
|
||||
@ -49,7 +48,8 @@ func NewServiceLogger(level string) *ServiceLogger {
|
||||
|
||||
// Log emits a structured log entry to stdout in JSON format
|
||||
func (l *ServiceLogger) Log(component, level, message string, details map[string]string) {
|
||||
if !l.isLogLevelEnabled(level) {
|
||||
normalizedLevel := strings.ToLower(level)
|
||||
if !l.isLogLevelEnabled(normalizedLevel) {
|
||||
return
|
||||
}
|
||||
|
||||
@ -58,7 +58,7 @@ func (l *ServiceLogger) Log(component, level, message string, details map[string
|
||||
defer l.mutex.Unlock()
|
||||
|
||||
serviceLog := api.ServiceLog{
|
||||
Level: level,
|
||||
Level: normalizedLevel,
|
||||
Component: component,
|
||||
Message: message,
|
||||
Details: details,
|
||||
@ -67,40 +67,32 @@ func (l *ServiceLogger) Log(component, level, message string, details map[string
|
||||
jsonData, err := l.formatter(serviceLog)
|
||||
if err != nil {
|
||||
// Fallback to simple logging if JSON formatting fails
|
||||
fmt.Printf(`{"timestamp":%d,"level":"ERROR","component":"logging","message":"%s","original_message":"%s"}`,
|
||||
l.out.Printf(`{"timestamp":%d,"level":"ERROR","component":"logging","message":"%s","original_message":"%s"}`+"\n",
|
||||
time.Now().UnixNano(), err.Error(), message)
|
||||
return
|
||||
}
|
||||
|
||||
fmt.Println(string(jsonData))
|
||||
l.out.Println(string(jsonData))
|
||||
}
|
||||
|
||||
// Debug logs a debug level entry
|
||||
func (l *ServiceLogger) Debug(component, message string, details map[string]string) {
|
||||
if l.isLogLevelEnabled("debug") {
|
||||
l.Log(component, "DEBUG", message, details)
|
||||
}
|
||||
l.Log(component, "debug", message, details)
|
||||
}
|
||||
|
||||
// Info logs an info level entry
|
||||
func (l *ServiceLogger) Info(component, message string, details map[string]string) {
|
||||
if l.isLogLevelEnabled("info") {
|
||||
l.Log(component, "INFO", message, details)
|
||||
}
|
||||
l.Log(component, "info", message, details)
|
||||
}
|
||||
|
||||
// Warn logs a warning level entry
|
||||
func (l *ServiceLogger) Warn(component, message string, details map[string]string) {
|
||||
if l.isLogLevelEnabled("warn") {
|
||||
l.Log(component, "WARN", message, details)
|
||||
}
|
||||
l.Log(component, "warn", message, details)
|
||||
}
|
||||
|
||||
// Error logs an error level entry
|
||||
func (l *ServiceLogger) Error(component, message string, details map[string]string) {
|
||||
if l.isLogLevelEnabled("error") {
|
||||
l.Log(component, "ERROR", message, details)
|
||||
}
|
||||
l.Log(component, "error", message, details)
|
||||
}
|
||||
|
||||
// isLogLevelEnabled checks if a log level should be emitted based on configured level
|
||||
|
||||
59
internal/logging/service_logger_test.go
Normal file
59
internal/logging/service_logger_test.go
Normal file
@ -0,0 +1,59 @@
|
||||
package logging
|
||||
|
||||
import (
|
||||
"bytes"
|
||||
"log"
|
||||
"strings"
|
||||
"testing"
|
||||
)
|
||||
|
||||
func TestIsLogLevelEnabled(t *testing.T) {
|
||||
tests := []struct {
|
||||
name string
|
||||
loggerLevel string
|
||||
messageLevel string
|
||||
want bool
|
||||
}{
|
||||
{name: "debug logger accepts debug", loggerLevel: "debug", messageLevel: "debug", want: true},
|
||||
{name: "debug logger accepts info", loggerLevel: "debug", messageLevel: "info", want: true},
|
||||
{name: "info logger rejects debug", loggerLevel: "info", messageLevel: "debug", want: false},
|
||||
{name: "info logger accepts info", loggerLevel: "info", messageLevel: "info", want: true},
|
||||
{name: "warn logger rejects info", loggerLevel: "warn", messageLevel: "info", want: false},
|
||||
{name: "warn logger accepts error", loggerLevel: "warn", messageLevel: "error", want: true},
|
||||
{name: "error logger accepts only error", loggerLevel: "error", messageLevel: "error", want: true},
|
||||
{name: "error logger rejects warn", loggerLevel: "error", messageLevel: "warn", want: false},
|
||||
}
|
||||
|
||||
for _, tt := range tests {
|
||||
t.Run(tt.name, func(t *testing.T) {
|
||||
logger := NewServiceLogger(tt.loggerLevel)
|
||||
if got := logger.isLogLevelEnabled(tt.messageLevel); got != tt.want {
|
||||
t.Fatalf("isLogLevelEnabled(%q) = %v, want %v", tt.messageLevel, got, tt.want)
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
func TestDebug_NotEmittedWhenLoggerLevelInfo(t *testing.T) {
|
||||
logger := NewServiceLogger("info")
|
||||
var buf bytes.Buffer
|
||||
logger.out = log.New(&buf, "", 0)
|
||||
|
||||
logger.Debug("service", "debug message", map[string]string{"k": "v"})
|
||||
|
||||
if buf.Len() != 0 {
|
||||
t.Fatalf("expected no output for debug at info level, got: %s", buf.String())
|
||||
}
|
||||
}
|
||||
|
||||
func TestLog_UppercaseDebug_NotEmittedWhenLoggerLevelInfo(t *testing.T) {
|
||||
logger := NewServiceLogger("info")
|
||||
var buf bytes.Buffer
|
||||
logger.out = log.New(&buf, "", 0)
|
||||
|
||||
logger.Log("service", "DEBUG", "debug message", nil)
|
||||
|
||||
if strings.TrimSpace(buf.String()) != "" {
|
||||
t.Fatalf("expected no output for uppercase DEBUG at info level, got: %s", buf.String())
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user