From 7391b739d4ebc4886246730e20f8b4e7b397cbb4 Mon Sep 17 00:00:00 2001
From: Will <will7989@hotmail.com>
Date: Thu, 14 Dec 2023 19:57:48 +0000
Subject: [PATCH] logging

---
 go.mod           |  6 +-----
 go.sum           |  4 ----
 server/server.go | 10 +++++++++-
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/go.mod b/go.mod
index 0c1f350..8efa94d 100644
--- a/go.mod
+++ b/go.mod
@@ -2,11 +2,7 @@ module github.com/willdot/messagebroker
 
 go 1.21.0
 
-require (
-	github.com/docker/distribution v2.8.3+incompatible
-	github.com/google/uuid v1.4.0
-	github.com/stretchr/testify v1.8.4
-)
+require github.com/stretchr/testify v1.8.4
 
 require (
 	github.com/davecgh/go-spew v1.1.1 // indirect
diff --git a/go.sum b/go.sum
index 42f8c32..fa4b6e6 100644
--- a/go.sum
+++ b/go.sum
@@ -1,9 +1,5 @@
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/docker/distribution v2.8.3+incompatible h1:AtKxIZ36LoNK51+Z6RpzLpddBirtxJnzDrHLEKxTAYk=
-github.com/docker/distribution v2.8.3+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
-github.com/google/uuid v1.4.0 h1:MtMxsa51/r9yyhkyLsVeVt0B+BGQZzpQiTQ4eHZ8bc4=
-github.com/google/uuid v1.4.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
diff --git a/server/server.go b/server/server.go
index bfb99a0..82f9d7d 100644
--- a/server/server.go
+++ b/server/server.go
@@ -37,7 +37,7 @@ const (
 func (s Status) String() string {
 	switch s {
 	case Subscribed:
-		return "subsribed"
+		return "subscribed"
 	case Unsubscribed:
 		return "unsubscribed"
 	case Error:
@@ -97,6 +97,9 @@ func (s *Server) start() {
 func (s *Server) handleConn(conn net.Conn) {
 	peer := peer.New(conn)
 
+	slog.Info("handling connection", "peer", peer.Addr())
+	defer slog.Info("ending connection", "peer", peer.Addr())
+
 	action, err := readAction(peer, 0)
 	if err != nil {
 		if !errors.Is(err, io.EOF) {
@@ -119,6 +122,7 @@ func (s *Server) handleConn(conn net.Conn) {
 }
 
 func (s *Server) handleSubscribe(peer *peer.Peer) {
+	slog.Info("handling subscriber", "peer", peer.Addr())
 	// subscribe the peer to the topic
 	s.subscribePeerToTopic(peer)
 
@@ -197,6 +201,7 @@ func (s *Server) subscribePeerToTopic(peer *peer.Peer) {
 }
 
 func (s *Server) handleUnsubscribe(peer *peer.Peer) {
+	slog.Info("handling unsubscriber", "peer", peer.Addr())
 	op := func(conn net.Conn) error {
 		// get the topics the peer wishes to unsubscribe from
 		dataLen, err := dataLength(conn)
@@ -241,6 +246,7 @@ type messageToSend struct {
 }
 
 func (s *Server) handlePublish(peer *peer.Peer) {
+	slog.Info("handling publisher", "peer", peer.Addr())
 	for {
 		var message *messageToSend
 
@@ -316,6 +322,7 @@ func (s *Server) handlePublish(peer *peer.Peer) {
 }
 
 func (s *Server) subscribeToTopics(peer *peer.Peer, topics []string) {
+	slog.Info("subscribing peer to topics", "topics", topics, "peer", peer.Addr())
 	for _, topic := range topics {
 		s.addSubsciberToTopic(topic, peer)
 	}
@@ -339,6 +346,7 @@ func (s *Server) addSubsciberToTopic(topicName string, peer *peer.Peer) {
 }
 
 func (s *Server) unsubscribeToTopics(peer *peer.Peer, topics []string) {
+	slog.Info("unsubscribing peer from topics", "topics", topics, "peer", peer.Addr())
 	for _, topic := range topics {
 		s.removeSubsciberFromTopic(topic, peer)
 	}
-- 
2.51.2