close func를 밖으로 옮김

This commit is contained in:
2023-07-05 22:26:57 +09:00
parent edd2f7aab5
commit 822681bf74
2 changed files with 53 additions and 85 deletions

View File

@ -8,16 +8,16 @@ import (
)
type room struct {
inChan chan *Richconn
outChan chan *Richconn
inChan chan *wsconn
outChan chan *wsconn
messageChan chan *UpstreamMessage
name string
}
func makeRoom(name string) *room {
return &room{
inChan: make(chan *Richconn, 10),
outChan: make(chan *Richconn, 10),
inChan: make(chan *wsconn, 10),
outChan: make(chan *wsconn, 10),
messageChan: make(chan *UpstreamMessage, 100),
name: name,
}
@ -27,17 +27,17 @@ func (r *room) broadcast(msg *UpstreamMessage) {
r.messageChan <- msg
}
func (r *room) in(conn *Richconn) {
func (r *room) in(conn *wsconn) {
r.inChan <- conn
}
func (r *room) out(conn *Richconn) {
func (r *room) out(conn *wsconn) {
r.outChan <- conn
}
func (r *room) start(ctx context.Context) {
go func(ctx context.Context) {
conns := make(map[string]*Richconn)
conns := make(map[string]*wsconn)
normal := false
for !normal {
normal = r.loop(ctx, &conns)
@ -45,7 +45,7 @@ func (r *room) start(ctx context.Context) {
}(ctx)
}
func (r *room) loop(ctx context.Context, conns *map[string]*Richconn) (normalEnd bool) {
func (r *room) loop(ctx context.Context, conns *map[string]*wsconn) (normalEnd bool) {
defer func() {
s := recover()
if s != nil {