From e822b4b461a854aa2f7e4e5d086d22ed9511cba6 Mon Sep 17 00:00:00 2001
From: Daniel Ponte <amigan@gmail.com>
Date: Sun, 4 Aug 2024 20:39:03 -0400
Subject: [PATCH] finally fixed

---
 pkg/gordio/nexus/nexus.go     |  7 -------
 pkg/gordio/nexus/websocket.go | 12 ++++++------
 pkg/gordio/sinks/nexus.go     |  3 ---
 3 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/pkg/gordio/nexus/nexus.go b/pkg/gordio/nexus/nexus.go
index 97d15b9..0c4578f 100644
--- a/pkg/gordio/nexus/nexus.go
+++ b/pkg/gordio/nexus/nexus.go
@@ -5,8 +5,6 @@ import (
 
 	"dynatron.me/x/stillbox/pkg/gordio/calls"
 	"dynatron.me/x/stillbox/pkg/pb"
-
-	"github.com/rs/zerolog/log"
 )
 
 type Nexus struct {
@@ -40,12 +38,10 @@ func (n *Nexus) Go(done <-chan struct{}) {
 	for {
 		select {
 		case call, ok := <-n.callCh:
-			log.Debug().Msg("call received from ch")
 			if !ok {
 				return
 			}
 
-			log.Debug().Msg("broadcasting call")
 			n.broadcastCallToClients(call)
 		case <-done:
 			return
@@ -55,7 +51,6 @@ func (n *Nexus) Go(done <-chan struct{}) {
 
 func (n *Nexus) BroadcastCall(call *calls.Call) {
 	n.callCh <- call
-	log.Debug().Msg("call sent to ch")
 }
 
 func (n *Nexus) broadcastCallToClients(call *calls.Call) {
@@ -66,9 +61,7 @@ func (n *Nexus) broadcastCallToClients(call *calls.Call) {
 	defer n.Unlock()
 
 	for cl, _ := range n.clients {
-		log.Debug().Msg("sending")
 		if cl.Send(message) {
-			log.Debug().Msg("channel was closed")
 			// we already hold the lock, and the channel is closed anyway
 			delete(n.clients, cl)
 		}
diff --git a/pkg/gordio/nexus/websocket.go b/pkg/gordio/nexus/websocket.go
index 16e1507..8d7725f 100644
--- a/pkg/gordio/nexus/websocket.go
+++ b/pkg/gordio/nexus/websocket.go
@@ -40,10 +40,8 @@ type wsConn struct {
 }
 
 func (w *wsConn) Send(msg *pb.Message) (closed bool) {
-	log.Debug().Msg("sending wsc")
 	select {
 	case w.out <- msg:
-		log.Debug().Str("msg", msg.String()).Msg("sent wsc")
 	default:
 		close(w.out)
 		return true
@@ -53,10 +51,12 @@ func (w *wsConn) Send(msg *pb.Message) (closed bool) {
 }
 
 func newWsConn(c *websocket.Conn) *wsConn {
-	return &wsConn{
+	wc := &wsConn{
 		Conn: c,
-		out:  make(chan *pb.Message),
+		out:  make(chan *pb.Message, qSize),
 	}
+
+	return wc
 }
 
 var upgrader = websocket.Upgrader{
@@ -76,10 +76,10 @@ func (wm *wsManager) serveWS(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	cli := wm.NewClient(newWsConn(conn))
+	wsc := newWsConn(conn)
+	cli := wm.NewClient(wsc)
 	wm.Register(cli)
 
-	wsc := newWsConn(conn)
 	go wsc.readPump(wm, cli)
 	go wsc.writePump()
 }
diff --git a/pkg/gordio/sinks/nexus.go b/pkg/gordio/sinks/nexus.go
index bd397e4..789eabd 100644
--- a/pkg/gordio/sinks/nexus.go
+++ b/pkg/gordio/sinks/nexus.go
@@ -5,8 +5,6 @@ import (
 
 	"dynatron.me/x/stillbox/pkg/gordio/calls"
 	"dynatron.me/x/stillbox/pkg/gordio/nexus"
-
-	"github.com/rs/zerolog/log"
 )
 
 type NexusSink struct {
@@ -26,7 +24,6 @@ func (ns *NexusSink) SinkType() string {
 }
 
 func (ns *NexusSink) Call(ctx context.Context, call *calls.Call) error {
-	log.Debug().Msg("nexus Call()")
 	ns.nexus.BroadcastCall(call)
 	return nil
 }