Autisticats/mautrix-discord
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use zerolog/local loggers instead of zerolog/log

Browse Source
This commit is contained in:
Skip R
2025-11-24 11:14:48 -08:00
parent 586cb2bfe6
commit bc13724b0a
2 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/connector/client.go
View File

@@ -24,7 +24,6 @@ import (
"github.com/bwmarrin/discordgo" "github.com/bwmarrin/discordgo"
"github.com/rs/zerolog" "github.com/rs/zerolog"
"github.com/rs/zerolog/log"
"maunium.net/go/mautrix/bridgev2" "maunium.net/go/mautrix/bridgev2"
"maunium.net/go/mautrix/bridgev2/status" "maunium.net/go/mautrix/bridgev2/status"
) )
@@ -35,11 +34,12 @@ type DiscordClient struct {
} }
func (d *DiscordConnector) LoadUserLogin(ctx context.Context, login *bridgev2.UserLogin) error { func (d *DiscordConnector) LoadUserLogin(ctx context.Context, login *bridgev2.UserLogin) error {
log := login.Log
meta := login.Metadata.(*UserLoginMetadata) meta := login.Metadata.(*UserLoginMetadata)
session, err := discordgo.New(meta.Token) session, err := discordgo.New(meta.Token)
if meta.HeartbeatSession.IsExpired() { 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 = discordgo.NewHeartbeatSession()
} }
meta.HeartbeatSession.BumpLastUsed() meta.HeartbeatSession.BumpLastUsed()
@@ -88,7 +88,7 @@ func (d *DiscordClient) Connect(ctx context.Context) {
} }
func (cl *DiscordClient) connect(ctx context.Context) error { func (cl *DiscordClient) connect(ctx context.Context) error {
log := log.Ctx(ctx) log := zerolog.Ctx(ctx)
log.Info().Msg("Opening session") log.Info().Msg("Opening session")
err := cl.Session.Open() err := cl.Session.Open()
@@ -130,7 +130,7 @@ func (cl *DiscordClient) connect(ctx context.Context) error {
} }
func (d *DiscordClient) Disconnect() { func (d *DiscordClient) Disconnect() {
log.Debug().Msg("Disconnecting session") d.UserLogin.Log.Info().Msg("Disconnecting session")
d.Session.Close() d.Session.Close()
d.Session = nil d.Session = nil
} }

5
pkg/connector/login.go
View File

@@ -23,7 +23,6 @@ import (
"github.com/bwmarrin/discordgo" "github.com/bwmarrin/discordgo"
"github.com/rs/zerolog" "github.com/rs/zerolog"
"github.com/rs/zerolog/log"
"maunium.net/go/mautrix/bridgev2" "maunium.net/go/mautrix/bridgev2"
"maunium.net/go/mautrix/bridgev2/database" "maunium.net/go/mautrix/bridgev2/database"
"maunium.net/go/mautrix/bridgev2/networkid" "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() { func (dl *DiscordLogin) softlyCloseSession() {
log.Debug().Msg("Closing session") dl.User.Log.Debug().Msg("Closing session")
err := dl.Session.Close() err := dl.Session.Close()
if err != nil { 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")
} }
} }