Merge pull request #10 from fancycode/chat_stats

Include number of chat message in hub statistics.

src/app/spreed-speakfreely-server/hub.go

@@ -30,6 +30,7 @@ import (
 	"github.com/gorilla/securecookie"
 	"log"
 	"sync"
+	"sync/atomic"
 	"time"
 )
 
@@ -51,6 +52,8 @@ type HubStat struct {
 	Connections           int                  `json:"connections"`
 	Users                 int                  `json:"users"`
 	Count                 uint64               `json:"count"`
+	BroadcastChatMessages uint64               `json:"broadcastchatmessages"`
+	UnicastChatMessages   uint64               `json:"unicastchatmessages"`
 	IdsInRoom             map[string][]string  `json:"idsinroom,omitempty"`
 	UsersById             map[string]*DataUser `json:"usersbyid,omitempty"`
 	ConnectionsByIdx      map[string]string    `json:"connectionsbyidx,omitempty"`
@@ -69,6 +72,8 @@ type Hub struct {
 	count                 uint64
 	mutex                 sync.RWMutex
 	buffers               BufferCache
+	broadcastChatMessages uint64
+	unicastChatMessages   uint64
 }
 
 func NewHub(version string, config *Config, sessionSecret string, turnSecret string) *Hub {
@@ -97,6 +102,8 @@ func (h *Hub) Stat(details bool) *HubStat {
 		Connections: len(h.connectionTable),
 		Users:       len(h.userTable),
 		Count:       h.count,
+		BroadcastChatMessages: atomic.LoadUint64(&h.broadcastChatMessages),
+		UnicastChatMessages:   atomic.LoadUint64(&h.unicastChatMessages),
 	}
 	if details {
 		rooms := make(map[string][]string)

src/app/spreed-speakfreely-server/server.go

@@ -23,6 +23,7 @@ package main
 import (
 	"encoding/json"
 	"log"
+	"sync/atomic"
 	"time"
 )
 
@@ -114,9 +115,11 @@ func (s *Server) OnText(c *Connection, b Buffer) {
 		if msg.Chat.To == "" {
 			// TODO(longsleep): Check if chat broadcast is allowed.
 			if c.h.config.defaultRoomEnabled || !c.h.isDefaultRoomid(c.Roomid) {
+				atomic.AddUint64(&c.h.broadcastChatMessages, 1)
 				s.Broadcast(c, msg.Chat)
 			}
 		} else {
+			atomic.AddUint64(&c.h.unicastChatMessages, 1)
 			s.Unicast(c, msg.Chat.To, msg.Chat)
 			if msg.Chat.Chat.Mid != "" {
 				// Send out delivery confirmation status chat message.