From 96e914e423af00f91d92bf287964d82b1d4bc20b Mon Sep 17 00:00:00 2001
From: Will <will7989@hotmail.com>
Date: Fri, 8 Dec 2023 22:17:03 +0000
Subject: [PATCH] small tweaks

---
 server/peer.go        | 14 ++------------
 server/server.go      |  2 +-
 server/server_test.go |  4 ++--
 3 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/server/peer.go b/server/peer.go
index b9a2e67..18298f8 100644
--- a/server/peer.go
+++ b/server/peer.go
@@ -1,11 +1,8 @@
 package server
 
 import (
-	"log/slog"
 	"net"
 	"sync"
-
-	"github.com/google/uuid"
 )
 
 // Status represents the status of a request
@@ -33,13 +30,11 @@ func (s Status) String() string {
 type peer struct {
 	conn   net.Conn
 	connMu sync.Mutex
-	name   string
 }
 
 func newPeer(conn net.Conn) peer {
 	return peer{
 		conn: conn,
-		name: uuid.New().String(),
 	}
 }
 
@@ -50,13 +45,8 @@ func (p *peer) addr() net.Addr {
 type connOpp func(conn net.Conn) error
 
 func (p *peer) connOperation(op connOpp, from string) error {
-	slog.Info("operation running", "from", from, "peer", p.conn.RemoteAddr(), "name", p.name, "mu addr", &p.connMu)
-
 	p.connMu.Lock()
-	err := op(p.conn)
-	p.connMu.Unlock()
-
-	slog.Info("operation finished", "from", from, "peer", p.conn.RemoteAddr(), "name", p.name, "mu addr", &p.connMu)
+	defer p.connMu.Unlock()
 
-	return err
+	return op(p.conn)
 }
diff --git a/server/server.go b/server/server.go
index fc439f1..02410a7 100644
--- a/server/server.go
+++ b/server/server.go
@@ -214,7 +214,7 @@ func (s *Server) handlePublish(peer peer) {
 		op := func(conn net.Conn) error {
 			dataLen, err := dataLength(conn)
 			if err != nil {
-				slog.Error(err.Error(), "peer", peer.addr())
+				slog.Error("failed to read data length", "error", err, "peer", peer.addr())
 				writeStatus(Error, "invalid data length of data provided", conn)
 				return nil
 			}
diff --git a/server/server_test.go b/server/server_test.go
index f75d5b8..6d89eff 100644
--- a/server/server_test.go
+++ b/server/server_test.go
@@ -215,8 +215,8 @@ func TestInvalidTopicDataPublished(t *testing.T) {
 func TestSendsDataToTopicSubscribers(t *testing.T) {
 	_ = createServer(t)
 
-	subscribers := make([]net.Conn, 0, 1)
-	for i := 0; i < 1; i++ {
+	subscribers := make([]net.Conn, 0, 10)
+	for i := 0; i < 10; i++ {
 		subscriberConn := createConnectionAndSubscribe(t, []string{topicA, topicB})
 
 		subscribers = append(subscribers, subscriberConn)
-- 
2.51.2