GitHub/ergo
3
0
Fork 0
mirror of https://github.com/ergochat/ergo.git synced 2024-12-31 15:12:34 +01:00
Code Issues Projects Releases Wiki Activity

use a select in the server commands loop

Browse Source
This commit is contained in:
Jeremy Latt 2014-02-16 22:38:43 -08:00
parent d5c9681a10
commit af5a05f390
2 changed files with 37 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ergonomadic.go
View File

@ -3,7 +3,6 @@ package main
import (
"github.com/jlatt/ergonomadic/irc"
"log"
"sync"
)
func main() {
@ -18,10 +17,5 @@ func main() {
irc.DEBUG_CHANNEL = config.Debug["channel"]
irc.DEBUG_SERVER = config.Debug["server"]
irc.NewServer(config)
// never finishes
wg := sync.WaitGroup{}
wg.Add(1)
wg.Wait()
irc.NewServer(config).ReceiveCommands()
}

76
irc/server.go
View File

@ -16,6 +16,7 @@ type Server struct {
channels ChannelNameMap
clients ClientNameMap
commands chan Command
conns chan net.Conn
ctime time.Time
motdFile string
name string
@ -28,6 +29,7 @@ func NewServer(config *Config) *Server {
channels: make(ChannelNameMap),
clients: make(ClientNameMap),
commands: make(chan Command),
conns: make(chan net.Conn),
ctime: time.Now(),
motdFile: config.MOTD,
name: config.Name,
@ -39,7 +41,6 @@ func NewServer(config *Config) *Server {
server.operators[opConf.Name] = opConf.Password
}
go server.receiveCommands()
for _, listenerConf := range config.Listeners {
go server.listen(listenerConf)
}
@ -47,38 +48,44 @@ func NewServer(config *Config) *Server {
return server
}
func (server *Server) receiveCommands() {
for command := range server.commands {
if DEBUG_SERVER {
log.Printf("%s → %s %+v", command.Client(), server, command)
}
client := command.Client()
func (server *Server) ReceiveCommands() {
for {
select {
case conn := <-server.conns:
NewClient(server, conn)
switch client.phase {
case Authorization:
authCommand, ok := command.(AuthServerCommand)
if !ok {
client.Destroy()
return
case command := <-server.commands:
if DEBUG_SERVER {
log.Printf("%s → %s %+v", command.Client(), server, command)
}
authCommand.HandleAuthServer(server)
client := command.Client()
case Registration:
regCommand, ok := command.(RegServerCommand)
if !ok {
client.Destroy()
return
}
regCommand.HandleRegServer(server)
switch client.phase {
case Authorization:
authCommand, ok := command.(AuthServerCommand)
if !ok {
client.Destroy()
continue
}
authCommand.HandleAuthServer(server)
default:
serverCommand, ok := command.(ServerCommand)
if !ok {
client.Reply(ErrUnknownCommand(server, command.Name()))
return
case Registration:
regCommand, ok := command.(RegServerCommand)
if !ok {
client.Destroy()
continue
}
regCommand.HandleRegServer(server)
default:
serverCommand, ok := command.(ServerCommand)
if !ok {
client.Reply(ErrUnknownCommand(server, command.Name()))
continue
}
client.Touch()
serverCommand.HandleServer(server)
}
client.Touch()
serverCommand.HandleServer(server)
}
}
}
@ -123,9 +130,7 @@ func (s *Server) listen(config ListenerConfig) {
log.Print("Server.Accept: ", conn.RemoteAddr())
}
s.commands <- &NewClientCommand{
conn: conn,
}
s.conns <- conn
}
}
@ -537,12 +542,3 @@ func (msg *NoticeCommand) HandleServer(server *Server) {
}
target.Reply(RplNotice(client, target, msg.message))
}
type NewClientCommand struct {
BaseCommand
conn net.Conn
}
func (msg *NewClientCommand) HandleServer(server *Server) {
NewClient(server, conn)
}