Browse Source

Removed debug and gofmt.

pull/3/head
Simon Eisenmann 12 years ago
parent
commit
78956b15a7
  1. 5
      src/app/spreed-speakfreely-server/connection.go
  2. 16
      src/app/spreed-speakfreely-server/hub.go

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

@ -143,7 +143,6 @@ func (c *Connection) readPump() {
c.ws.SetReadLimit(maxMessageSize) c.ws.SetReadLimit(maxMessageSize)
c.ws.SetReadDeadline(time.Now().Add(pongWait)) c.ws.SetReadDeadline(time.Now().Add(pongWait))
c.ws.SetPongHandler(func(string) error { c.ws.SetPongHandler(func(string) error {
log.Println("Received pong", c.Idx)
c.ws.SetReadDeadline(time.Now().Add(pongWait)) c.ws.SetReadDeadline(time.Now().Add(pongWait))
return nil return nil
}) })
@ -270,10 +269,6 @@ func (c *Connection) writePump() {
// Write ping message. // Write ping message.
func (c *Connection) ping() error { func (c *Connection) ping() error {
log.Println("Sending ping", c.Idx)
defer func() {
log.Println("Sent ping", c.Idx)
}()
return c.write(websocket.PingMessage, []byte{}) return c.write(websocket.PingMessage, []byte{})
} }

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

@ -46,13 +46,13 @@ type MessageRequest struct {
} }
type HubStat struct { type HubStat struct {
Rooms int `json:"rooms"` Rooms int `json:"rooms"`
Connections int `json:"connections"` Connections int `json:"connections"`
Users int `json:"users"` Users int `json:"users"`
Count uint64 `json:"count"` Count uint64 `json:"count"`
IdsInRoom map[string][]string `json:"idsinroom,omitempty"` IdsInRoom map[string][]string `json:"idsinroom,omitempty"`
UsersById map[string]*DataUser `json:"usersbyid,omitempty"` UsersById map[string]*DataUser `json:"usersbyid,omitempty"`
ConnectionsByIdx map[string]string `json:"connectionsbyidx,omitempty"` ConnectionsByIdx map[string]string `json:"connectionsbyidx,omitempty"`
} }
type Hub struct { type Hub struct {
@ -112,7 +112,7 @@ func (h *Hub) Stat(details bool) *HubStat {
stat.UsersById = users stat.UsersById = users
connections := make(map[string]string) connections := make(map[string]string)
for id, connection := range h.connectionTable { for id, connection := range h.connectionTable {
connections[fmt.Sprintf("%d", connection.Idx)]=id connections[fmt.Sprintf("%d", connection.Idx)] = id
} }
stat.ConnectionsByIdx = connections stat.ConnectionsByIdx = connections
} }

Loading…
Cancel
Save