From 31502108cb29c994ce70b4f81b5d08b9f6a1fc35 Mon Sep 17 00:00:00 2001
From: Joonas Lehtimaki <joonas.lehtimaki@gmail.com>
Date: Wed, 12 Jun 2024 12:16:00 +0300
Subject: [PATCH] feat: adding more logging and fixing mutex locks

---
 pkg/discord/discord.go | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/pkg/discord/discord.go b/pkg/discord/discord.go
index 7f7f767..c91f88c 100644
--- a/pkg/discord/discord.go
+++ b/pkg/discord/discord.go
@@ -25,6 +25,7 @@ type Discord struct {
 	Requests      map[string]time.Time
 	Faucet        faucet.Faucet
 	logger        zerolog.Logger
+	*sync.Mutex
 }
 
 func InitDiscord() (Discord, error) {
@@ -42,6 +43,8 @@ func InitDiscord() (Discord, error) {
 	if d.Token == "" {
 		return Discord{}, fmt.Errorf("missing discord token")
 	}
+
+	d.logger.Info().Msg("initialising discord connection")
 	d.Session, err = discordgo.New("Bot " + d.Token)
 	if err != nil {
 		return Discord{}, err
@@ -49,6 +52,7 @@ func InitDiscord() (Discord, error) {
 
 	d.Requests = make(map[string]time.Time)
 
+	d.logger.Info().Msg("initialising faucet")
 	d.Faucet, err = faucet.InitFaucet()
 	if err != nil {
 		return Discord{}, err
@@ -134,9 +138,8 @@ func (d *Discord) requestFunds(m *discordgo.MessageCreate) {
 }
 
 func (d *Discord) purgeExpiredEntries() {
-	var mu sync.Mutex
-	mu.Lock()
-	defer mu.Unlock()
+	d.Lock()
+	defer d.Unlock()
 
 	now := time.Now()
 	for k, v := range d.Requests {