From b3735ee713c1de74c2a812150862d608af0c2c91 Mon Sep 17 00:00:00 2001 From: Joel Wetzell Date: Tue, 18 Nov 2025 18:57:39 -0600 Subject: [PATCH] use slog --- cmd/cli/main.go | 1 - router.go | 10 ++++++++++ tcp-client.go | 7 ++++--- tcp-server.go | 7 ++++--- udp-server.go | 3 ++- 5 files changed, 20 insertions(+), 8 deletions(-) diff --git a/cmd/cli/main.go b/cmd/cli/main.go index 210c565..8734357 100644 --- a/cmd/cli/main.go +++ b/cmd/cli/main.go @@ -29,7 +29,6 @@ func main() { if err != nil { return err } - fmt.Printf("%+v\n", config) router, err := showbridge.NewRouter(ctx, config) if err != nil { return err diff --git a/router.go b/router.go index 65e562e..447dfda 100644 --- a/router.go +++ b/router.go @@ -3,6 +3,8 @@ package showbridge import ( "context" "fmt" + "log/slog" + "os" ) type Router struct { @@ -12,6 +14,14 @@ type Router struct { func NewRouter(ctx context.Context, config Config) (*Router, error) { + logger := slog.New(slog.NewTextHandler(os.Stdout, &slog.HandlerOptions{ + Level: slog.LevelDebug, + })) + + slog.SetDefault(logger) + + slog.Debug("creating router", "config", config) + router := Router{ Context: ctx, ModuleInstances: []Module{}, diff --git a/tcp-client.go b/tcp-client.go index b29e203..1487f9a 100644 --- a/tcp-client.go +++ b/tcp-client.go @@ -3,6 +3,7 @@ package showbridge import ( "context" "fmt" + "log/slog" "net" "time" ) @@ -49,7 +50,7 @@ func (ts TCPClient) Run(ctx context.Context) error { for { client, err := net.Dial("tcp", fmt.Sprintf(":%d", ts.Port)) if err != nil { - fmt.Println(err) + slog.Error(err.Error()) time.Sleep(time.Second * 2) continue } @@ -68,12 +69,12 @@ func (ts TCPClient) Run(ctx context.Context) error { byteCount, err := client.Read(buffer) if err != nil { - fmt.Println("connection closed") + slog.Debug("connection closed") break READ } if byteCount > 0 { - fmt.Println(buffer[0:byteCount]) + slog.Info(string(buffer[0:byteCount])) } } diff --git a/tcp-server.go b/tcp-server.go index a3fdc33..de7c7ea 100644 --- a/tcp-server.go +++ b/tcp-server.go @@ -3,6 +3,7 @@ package showbridge import ( "context" "fmt" + "log/slog" "net" ) @@ -31,7 +32,7 @@ func init() { } func (ts TCPServer) HandleClient(ctx context.Context, client net.Conn) { - fmt.Printf("handling connection %s\n", client.RemoteAddr()) + slog.Info("handling connection", "remoteAddr", client.RemoteAddr().String()) buffer := make([]byte, 1024) for { @@ -43,13 +44,13 @@ func (ts TCPServer) HandleClient(ctx context.Context, client net.Conn) { if err != nil { if err.Error() == "EOF" { - fmt.Println("connection closed") + slog.Debug("connection closed") } return } if byteCount > 0 { - fmt.Println(buffer[0:byteCount]) + slog.Info(string(buffer[0:byteCount])) } } diff --git a/udp-server.go b/udp-server.go index 523c347..9c40e73 100644 --- a/udp-server.go +++ b/udp-server.go @@ -4,6 +4,7 @@ import ( "context" "fmt" "log" + "log/slog" "net" ) @@ -55,7 +56,7 @@ func (us UDPServer) Run(ctx context.Context) error { if err != nil { return err } - fmt.Println(buffer[:numBytes]) + slog.Info(string(buffer[:numBytes])) } }