Fix several races

[goircd.git] / room.go

diff --git a/room.go b/room.go
index f92d0e6b08811f89758111420da09ba80204416c..6fc2bcaa94b8b072858c7afd59d5d17f22f6b0f8 100644 (file)
--- a/room.go
+++ b/room.go
@@ -36,16 +36,17 @@ func RoomNameValid(name string) bool {
 }
 
 type Room struct {
+       Verbose    bool
        name       string
        topic      string
        key        string
        members    map[*Client]bool
        hostname   string
-       log_sink   chan LogEvent
-       state_sink chan StateEvent
+       log_sink   chan<- LogEvent
+       state_sink chan<- StateEvent
 }
 
-func NewRoom(hostname, name string, log_sink chan LogEvent, state_sink chan StateEvent) *Room {
+func NewRoom(hostname, name string, log_sink chan<- LogEvent, state_sink chan<- StateEvent) *Room {
        room := Room{name: name}
        room.members = make(map[*Client]bool)
        room.topic = ""
@@ -78,16 +79,18 @@ func (room *Room) StateSave() {
        room.state_sink <- StateEvent{room.name, room.topic, room.key}
 }
 
-func (room *Room) Processor(events chan ClientEvent) {
+func (room *Room) Processor(events <-chan ClientEvent) {
        var client *Client
        for event := range events {
                client = event.client
                switch event.event_type {
                case EVENT_NEW:
                        room.members[client] = true
-                       log.Println(client, "joined", room.name)
+                       if room.Verbose {
+                               log.Println(client, "joined", room.name)
+                       }
                        room.SendTopic(client)
-                       go room.Broadcast(fmt.Sprintf(":%s JOIN %s", client, room.name))
+                       room.Broadcast(fmt.Sprintf(":%s JOIN %s", client, room.name))
                        room.log_sink <- LogEvent{room.name, client.nickname, "joined", true}
                        nicknames := []string{}
                        for member := range room.members {
@@ -103,7 +106,7 @@ func (room *Room) Processor(events chan ClientEvent) {
                        }
                        delete(room.members, client)
                        msg := fmt.Sprintf(":%s PART %s :%s", client, room.name, client.nickname)
-                       go room.Broadcast(msg)
+                       room.Broadcast(msg)
                        room.log_sink <- LogEvent{room.name, client.nickname, "left", true}
                case EVENT_TOPIC:
                        if _, subscribed := room.members[client]; !subscribed {
@@ -163,7 +166,7 @@ func (room *Room) Processor(events chan ClientEvent) {
                        room.StateSave()
                case EVENT_MSG:
                        sep := strings.Index(event.text, " ")
-                       go room.Broadcast(fmt.Sprintf(":%s %s %s :%s", client, event.text[:sep], room.name, event.text[sep+1:]), client)
+                       room.Broadcast(fmt.Sprintf(":%s %s %s :%s", client, event.text[:sep], room.name, event.text[sep+1:]), client)
                        room.log_sink <- LogEvent{room.name, client.nickname, event.text[sep+1:], false}
                }
        }