X-Git-Url: http://www.git.cypherpunks.ru/?p=goircd.git;a=blobdiff_plain;f=daemon.go;h=b3fed28cb10f43be262351b172ce877de7504eab;hp=30d8c5ddc77a8e8980dcfa0a19e8d106e11ab4bb;hb=e9a315574b96c6a235c9d55e607c3b4526eedf2f;hpb=e80115cf6921d4fc2d64b3b809c76a5019f82309

diff --git a/daemon.go b/daemon.go
index 30d8c5d..b3fed28 100644
--- a/daemon.go
+++ b/daemon.go
@@ -48,7 +48,7 @@ type Daemon struct {
 	hostname           *string
 	motd               *string
 	passwords          *string
-	clients            map[*Client]bool
+	clients            map[*Client]struct{}
 	clientAliveness    map[*Client]*ClientAlivenessState
 	rooms              map[string]*Room
 	roomSinks          map[*Room]chan ClientEvent
@@ -59,12 +59,12 @@ type Daemon struct {
 
 func NewDaemon(version string, hostname, motd, passwords *string, logSink chan<- LogEvent, stateSink chan<- StateEvent) *Daemon {
 	daemon := Daemon{
-		version: version,
-		hostname: hostname,
-		motd: motd,
+		version:   version,
+		hostname:  hostname,
+		motd:      motd,
 		passwords: passwords,
 	}
-	daemon.clients = make(map[*Client]bool)
+	daemon.clients = make(map[*Client]struct{})
 	daemon.clientAliveness = make(map[*Client]*ClientAlivenessState)
 	daemon.rooms = make(map[string]*Room)
 	daemon.roomSinks = make(map[*Room]chan ClientEvent)
@@ -303,8 +303,9 @@ func (daemon *Daemon) HandlerJoin(client *Client, cmd string) {
 }
 
 func (daemon *Daemon) Processor(events <-chan ClientEvent) {
+	var now time.Time
 	for event := range events {
-		now := time.Now()
+		now = time.Now()
 		client := event.client
 
 		// Check for clients aliveness
@@ -334,9 +335,9 @@ func (daemon *Daemon) Processor(events <-chan ClientEvent) {
 
 		switch event.eventType {
 		case EventNew:
-			daemon.clients[client] = true
+			daemon.clients[client] = struct{}{}
 			daemon.clientAliveness[client] = &ClientAlivenessState{
-				pingSent: false,
+				pingSent:  false,
 				timestamp: now,
 			}
 		case EventDel: