1

Author: babyTsakhes

connection.go

@@ -1562,6 +1562,11 @@ func (conn *Connection) shutdown(forever bool) error {
 	conn.cond.Broadcast()
 	conn.notify(Shutdown)
 
+	// Logging the shutdown event
+	conn.logEvent(ShutdownEvent{
+		baseEvent: newBaseEvent(conn.addr),
+	})
+
 	c := conn.c
 	for {
 		if (atomic.LoadUint32(&conn.state) != connShutdown) || (c != conn.c) {

connection_events.go

@@ -151,6 +151,7 @@ type ShutdownEvent struct {
 }
 
 func (e ShutdownEvent) EventName() string    { return "shutdown" }
+func (e ShutdownEvent) Message() string      { return "Server shutdown in progress" }
 func (e ShutdownEvent) LogLevel() slog.Level { return slog.LevelInfo }
 func (e ShutdownEvent) LogAttrs() []slog.Attr {
 	attrs := e.baseAttrs()
@@ -171,38 +172,6 @@ func (e ClosedEvent) LogAttrs() []slog.Attr {
 	return attrs
 }
 
-type ConnectionPoolEvent struct {
-	baseEvent
-	PoolSize    int
-	ActiveConns int
-	Event       string
-}
-
-func (e ConnectionPoolEvent) EventName() string { return "connection_pool_" + e.Event }
-func (e ConnectionPoolEvent) Message() string {
-	switch e.Event {
-	case "added":
-		return "Connection added to pool"
-	case "removed":
-		return "Connection removed from pool"
-	case "full":
-		return "Connection pool is full"
-	default:
-		return "Connection pool event: " + e.Event
-	}
-}
-func (e ConnectionPoolEvent) LogLevel() slog.Level { return slog.LevelInfo }
-func (e ConnectionPoolEvent) LogAttrs() []slog.Attr {
-	attrs := e.baseAttrs()
-	attrs = append(attrs,
-		slog.String("event", e.EventName()),
-		slog.Int("pool_size", e.PoolSize),
-		slog.Int("active_connections", e.ActiveConns),
-		slog.String("pool_event", e.Event),
-	)
-	return attrs
-}
-
 type TimeoutEvent struct {
 	baseEvent
 	RequestId uint32

logger.go

@@ -2,7 +2,6 @@ package tarantool
 
 import (
 	"context"
-	"log"
 	"log/slog"
 )
 
@@ -15,6 +14,11 @@ type SlogLogger struct {
 	ctx    context.Context
 }
 
+// NewSlogLogger creates a new SlogLogger that uses the provided slog.Logger.
+// If logger is nil, it uses slog.Default().
+// Note: slog.Default() logs at Info level by default. To log events with lower levels
+// (e.g., Debug), either configure the default logger's level using slog.SetLogLoggerLevel
+// or provide a custom logger with the desired level.
 func NewSlogLogger(logger *slog.Logger) SlogLogger {
 	if logger == nil {
 		logger = slog.Default()
@@ -58,19 +62,3 @@ func (l SlogLogger) Report(event LogEvent, conn *Connection) {
 
 	l.logger.LogAttrs(l.ctx, event.LogLevel(), event.Message(), attrs...)
 }
-
-type SimpleLogger struct{}
-
-func (l SimpleLogger) Report(event LogEvent, conn *Connection) {
-	attrs := event.LogAttrs()
-
-	log.Printf("[%s] %s [event=%s]", event.LogLevel(), event.Message(), event.EventName())
-
-	for _, attr := range attrs {
-		if attr.Key == "error" {
-			log.Printf("  Error: %v", attr.Value.Any())
-		} else if attr.Key == "request_id" {
-			log.Printf("  Request ID: %v", attr.Value.Any())
-		}
-	}
-}

tarantool_test.go

@@ -8,6 +8,7 @@ import (
 	"fmt"
 	"io"
 	"log"
+	"log/slog"
 	"math"
 	"os"
 	"os/exec"
@@ -2897,24 +2898,29 @@ func TestStream_DoWithClosedConn(t *testing.T) {
 }
 
 func TestConnectionBoxSessionPushUnsupported(t *testing.T) {
-	old := log.Writer()
-	defer log.SetOutput(old)
-
+	// Creating a buffer for intercepting logs
 	var buf bytes.Buffer
-	log.SetOutput(&buf)
+	// Setting up the slog handler, which writes to the buffer in text format
+	handler := slog.NewTextHandler(&buf, &slog.HandlerOptions{
+		Level: slog.LevelWarn,
+	})
+	logger := slog.New(handler)
 
+	// Use a copy of the options and replace the logger
 	testOpts := opts
-	testOpts.Logger = SimpleLogger{}
+	testOpts.Logger = NewSlogLogger(logger)
 
 	conn := test_helpers.ConnectWithValidation(t, dialer, testOpts)
 	defer conn.Close()
 
+	// Calling the function that should generate a push event
 	_, err := conn.Do(NewCallRequest("push_func").Args([]interface{}{1})).Get()
 	require.NoError(t, err)
 
+	// Check that the expected message has appeared in the logs
 	actualLog := buf.String()
-	expectedLog := "box_session_push_unsupported"
-	require.Contains(t, actualLog, expectedLog)
+	expectedSubstr := "box_session_push_unsupported"
+	require.Contains(t, actualLog, expectedSubstr)
 }
 
 func TestConnectionProtocolInfoSupported(t *testing.T) {