Finilize rebase

Author: dnfd

pkg/message/msg.go

@@ -2,8 +2,6 @@ package msg
 
 import (
 	"encoding/json"
-
-	"github.com/rs/zerolog/log"
 )
 
 const (
@@ -44,7 +42,6 @@ func (m *Msg) Encode() []byte {
 		m.Args,
 	})
 	if err != nil {
-		log.Error().Msgf("Fail to encode Msg %v, %s", m, err.Error())
 		return []byte{}
 	}
 	return s

pkg/msg/msg.go

@@ -87,13 +87,6 @@ func NewClient(hub *Hub, w http.ResponseWriter, r *http.Request) {
 		log.Info().Msgf("New authenticated connection: %s", client.UID)
 	}
 
-	hub.handleSubscribe(&Request{
-		client: client,
-		Request: msg.Request{
-			Streams: parseStreamsFromURI(r.RequestURI),
-		},
-	})
-
 	metrics.RecordHubClientNew()
 
 	// Allow collection of memory referenced by the caller by doing all work in

pkg/routing/client.go

@@ -304,8 +304,11 @@ func (h *Hub) handleSubscribePublic(client IClient, streams []string) {
 			h.PublicTopics[t] = topic
 		}
 
-		topic.subscribe(client)
-		client.SubscribePublic(t)
+		if topic.subscribe(client) {
+			client.SubscribePublic(t)
+			metrics.RecordHubSubscription("public", t)
+		}
+
 		if isIncrementObject(t) {
 			o, ok := h.IncrementalObjects[t]
 			if ok && o.Snapshot != "" {
@@ -332,8 +335,10 @@ func (h *Hub) handleSubscribePrivate(client IClient, uid string, streams []strin
 			uTopics[t] = topic
 		}
 
-		topic.subscribe(client)
-		client.SubscribePrivate(t)
+		if topic.subscribe(client) {
+			client.SubscribePrivate(t)
+			metrics.RecordHubSubscription("private", t)
+		}
 	}
 }