add logging

h3mmy · May 14, 2024 · 24732a1 · 24732a1
1 parent 31ba20b
commit 24732a1
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 10 deletions.
diff --git a/bot/asynchandlers/message_reactor.go b/bot/asynchandlers/message_reactor.go
@@ -61,6 +61,7 @@ func (mr *MessageReactor) ShouldAddReaction(s *discordgo.Session, m *discordgo.M
 			zap.String("messageID", m.ID),
 		)
 		// react to the referenced message
+		// s.ChannelMessage(m.ChannelID, m.ID)
 		err := mr.ReactToMessage(s, m.ReferencedMessage)
 		if err != nil {
 			logger.Warn("failed reacting to referenced message", zap.Error(err))
@@ -78,6 +79,7 @@ func (mr *MessageReactor) ShouldAddReaction(s *discordgo.Session, m *discordgo.M
 		)
 		return false
 	} else {
+		logger.Debug("found the last message?", zap.Int("lastChannelMessages size", len(lastChannelMessages)))
 		lastMessage := lastChannelMessages[0]
 		if lastMessage != nil {
 			logger.Debug("last message is nil for some reason",
@@ -106,7 +108,7 @@ func (mr *MessageReactor) ShouldAddReaction(s *discordgo.Session, m *discordgo.M
 }
 
 func (mr *MessageReactor) ReactToMessage(s *discordgo.Session, m *discordgo.Message) error {
-	logger := mr.logger.With(zap.String("method", "ReactToMessage"))
+	logger := mr.logger.With(zap.String("method", "ReactToMessage"), zap.String("messageID", m.ID))
 	guildEmojis, err := s.GuildEmojis(m.GuildID)
 	if err != nil {
 		logger.Warn("could not get emoji for guild", zap.String("guildID", m.GuildID))

diff --git a/bot/k8s/client.go b/bot/k8s/client.go
@@ -4,21 +4,23 @@ import (
 	"os"
 
 	"github.com/h3mmy/bloopyboi/bot/internal/log"
+	"go.uber.org/zap"
 	"k8s.io/client-go/kubernetes"
 	"k8s.io/client-go/rest"
 	"k8s.io/client-go/tools/clientcmd"
 	"k8s.io/metrics/pkg/client/clientset/versioned"
 )
 
 var (
-	logger = log.NewZapLogger()
+	logger = log.NewZapLogger().Named("k8s")
 )
 
 // GetClient returns a k8s clientset
 func GetClient() kubernetes.Interface {
 	var kubeClient kubernetes.Interface
 	_, err := rest.InClusterConfig()
 	if err != nil {
+		logger.Warn("error building in-cluster client", zap.Error(err))
 		kubeClient = getClientOutOfCluster()
 	} else {
 		kubeClient = getClientInCluster()
@@ -31,6 +33,7 @@ func GetMetricsClient() versioned.Clientset {
 	var kubeClient versioned.Clientset
 	_, err := rest.InClusterConfig()
 	if err != nil {
+		logger.Warn("error building in-cluster metrics-client", zap.Error(err))
 		kubeClient = *getMetricsClientOutOfCluster()
 	} else {
 		kubeClient = *getMetricsClientInCluster()
@@ -43,12 +46,12 @@ func GetMetricsClient() versioned.Clientset {
 func getClientInCluster() kubernetes.Interface {
 	config, err := rest.InClusterConfig()
 	if err != nil {
-		logger.Sugar().Fatalf("Can not get kubernetes config: %v", err)
+		logger.Sugar().Errorf("Can not get kubernetes config: %v", err)
 	}
 
 	clientset, err := kubernetes.NewForConfig(config)
 	if err != nil {
-		logger.Sugar().Fatalf("Can not create kubernetes client: %v", err)
+		logger.Sugar().Errorf("Can not create kubernetes client: %v", err)
 	}
 
 	return clientset
@@ -58,12 +61,12 @@ func getClientInCluster() kubernetes.Interface {
 func getMetricsClientInCluster() *versioned.Clientset {
 	config, err := rest.InClusterConfig()
 	if err != nil {
-		logger.Sugar().Fatalf("Can not get kubernetes config: %v", err)
+		logger.Sugar().Errorf("Can not get kubernetes config: %v", err)
 	}
 
 	clientset, err := versioned.NewForConfig(config)
 	if err != nil {
-		logger.Sugar().Fatalf("Can not create metrics client: %v", err)
+		logger.Sugar().Errorf("Can not create metrics client: %v", err)
 	}
 
 	return clientset
@@ -81,13 +84,13 @@ func buildOutOfClusterConfig() (*rest.Config, error) {
 func getClientOutOfCluster() kubernetes.Interface {
 	config, err := buildOutOfClusterConfig()
 	if err != nil {
-		logger.Sugar().Fatalf("Cannot get kubernetes config: %v", err)
+		logger.Sugar().Errorf("Cannot get kubernetes config: %v", err)
 	}
 
 	clientset, err := kubernetes.NewForConfig(config)
 
 	if err != nil {
-		logger.Sugar().Fatalf("Cannot create new kubernetes client from config: %v", err)
+		logger.Sugar().Errorf("Cannot create new kubernetes client from config: %v", err)
 	}
 
 	return clientset
@@ -97,13 +100,13 @@ func getClientOutOfCluster() kubernetes.Interface {
 func getMetricsClientOutOfCluster() *versioned.Clientset {
 	config, err := buildOutOfClusterConfig()
 	if err != nil {
-		logger.Sugar().Fatalf("Cannot get kubernetes config: %v", err)
+		logger.Sugar().Errorf("Cannot get kubernetes config: %v", err)
 	}
 
 	clientset, err := versioned.NewForConfig(config)
 
 	if err != nil {
-		logger.Sugar().Fatalf("Cannot create new metrics client from config: %v", err)
+		logger.Sugar().Errorf("Cannot create new metrics client from config: %v", err)
 	}
 
 	return clientset