|
|
@ -134,7 +134,7 @@ func (r *RoomWorker) Run(f func()) bool { |
|
|
|
func (r *RoomWorker) usersHandler(c *Connection) { |
|
|
|
func (r *RoomWorker) usersHandler(c *Connection) { |
|
|
|
|
|
|
|
|
|
|
|
worker := func() { |
|
|
|
worker := func() { |
|
|
|
users := &DataSessions{Type: "Users"} |
|
|
|
sessions := &DataSessions{Type: "Users"} |
|
|
|
var sl []*DataSession |
|
|
|
var sl []*DataSession |
|
|
|
appender := func(ec *Connection) bool { |
|
|
|
appender := func(ec *Connection) bool { |
|
|
|
ecsession := ec.Session |
|
|
|
ecsession := ec.Session |
|
|
@ -164,17 +164,17 @@ func (r *RoomWorker) usersHandler(c *Connection) { |
|
|
|
break |
|
|
|
break |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
users.Users = sl |
|
|
|
sessions.Users = sl |
|
|
|
usersJson := c.h.buffers.New() |
|
|
|
sessionsJson := c.h.buffers.New() |
|
|
|
encoder := json.NewEncoder(usersJson) |
|
|
|
encoder := json.NewEncoder(sessionsJson) |
|
|
|
err := encoder.Encode(&DataOutgoing{From: c.Id, Data: users}) |
|
|
|
err := encoder.Encode(&DataOutgoing{From: c.Id, Data: sessions}) |
|
|
|
if err != nil { |
|
|
|
if err != nil { |
|
|
|
log.Println("Users error while encoding JSON", err) |
|
|
|
log.Println("Users error while encoding JSON", err) |
|
|
|
usersJson.Decref() |
|
|
|
sessionsJson.Decref() |
|
|
|
return |
|
|
|
return |
|
|
|
} |
|
|
|
} |
|
|
|
c.send(usersJson) |
|
|
|
c.send(sessionsJson) |
|
|
|
usersJson.Decref() |
|
|
|
sessionsJson.Decref() |
|
|
|
|
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|