From bc13724b0a0d2d7324f221f6dacd25ed7633e1d2 Mon Sep 17 00:00:00 2001
From: Skip R <tinyslices@gmail.com>
Date: Mon, 24 Nov 2025 11:14:48 -0800
Subject: [PATCH] use `zerolog`/local loggers instead of `zerolog/log`

---
 pkg/connector/client.go | 8 ++++----
 pkg/connector/login.go  | 5 ++---
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/pkg/connector/client.go b/pkg/connector/client.go
index b55f0fc..b65cdb4 100644
--- a/pkg/connector/client.go
+++ b/pkg/connector/client.go
@@ -24,7 +24,6 @@ import (
 
 	"github.com/bwmarrin/discordgo"
 	"github.com/rs/zerolog"
-	"github.com/rs/zerolog/log"
 	"maunium.net/go/mautrix/bridgev2"
 	"maunium.net/go/mautrix/bridgev2/status"
 )
@@ -35,11 +34,12 @@ type DiscordClient struct {
 }
 
 func (d *DiscordConnector) LoadUserLogin(ctx context.Context, login *bridgev2.UserLogin) error {
+	log := login.Log
 	meta := login.Metadata.(*UserLoginMetadata)
 
 	session, err := discordgo.New(meta.Token)
 	if meta.HeartbeatSession.IsExpired() {
-		log.Ctx(ctx).Info().Msg("Heartbeat session expired, creating a new one")
+		log.Info().Msg("Heartbeat session expired, creating a new one")
 		meta.HeartbeatSession = discordgo.NewHeartbeatSession()
 	}
 	meta.HeartbeatSession.BumpLastUsed()
@@ -88,7 +88,7 @@ func (d *DiscordClient) Connect(ctx context.Context) {
 }
 
 func (cl *DiscordClient) connect(ctx context.Context) error {
-	log := log.Ctx(ctx)
+	log := zerolog.Ctx(ctx)
 	log.Info().Msg("Opening session")
 
 	err := cl.Session.Open()
@@ -130,7 +130,7 @@ func (cl *DiscordClient) connect(ctx context.Context) error {
 }
 
 func (d *DiscordClient) Disconnect() {
-	log.Debug().Msg("Disconnecting session")
+	d.UserLogin.Log.Info().Msg("Disconnecting session")
 	d.Session.Close()
 	d.Session = nil
 }
diff --git a/pkg/connector/login.go b/pkg/connector/login.go
index 8802642..f8992bd 100644
--- a/pkg/connector/login.go
+++ b/pkg/connector/login.go
@@ -23,7 +23,6 @@ import (
 
 	"github.com/bwmarrin/discordgo"
 	"github.com/rs/zerolog"
-	"github.com/rs/zerolog/log"
 	"maunium.net/go/mautrix/bridgev2"
 	"maunium.net/go/mautrix/bridgev2/database"
 	"maunium.net/go/mautrix/bridgev2/networkid"
@@ -150,10 +149,10 @@ func (dl *DiscordLogin) SubmitUserInput(ctx context.Context, input map[string]st
 }
 
 func (dl *DiscordLogin) softlyCloseSession() {
-	log.Debug().Msg("Closing session")
+	dl.User.Log.Debug().Msg("Closing session")
 	err := dl.Session.Close()
 	if err != nil {
-		log.Err(err).Msg("Couldn't close Discord session in response to login cancellation")
+		dl.User.Log.Err(err).Msg("Couldn't close Discord session in response to login cancellation")
 	}
 }