mirror
/
goirc
mirror of https://github.com/fluffle/goirc
1
0
Fork 0
Code Issues Releases Wiki Activity

Squash a couple of bugs found by the unit tests.

This commit is contained in:
Alex Bramley 2011-11-09 21:14:24 +00:00
parent cdd08b2de8
commit bdb5c9b1a0
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
event/registry.go
View File

@ -55,7 +55,7 @@ type registry struct {
dispatcher func(r *registry, name string, ev ...interface{}) dispatcher func(r *registry, name string, ev ...interface{})
} }
func NewRegistry() EventRegistry { func NewRegistry() *registry {
r := &registry{events: make(map[string]*list.List)} r := &registry{events: make(map[string]*list.List)}
r.Parallel() r.Parallel()
return r return r
@ -67,7 +67,7 @@ func (r *registry) AddHandler(h Handler, names ...string) {
} }
r.Lock() r.Lock()
defer r.Unlock() defer r.Unlock()
for _, name := range names { N: for _, name := range names {
name = strings.ToLower(name) name = strings.ToLower(name)
if _, ok := r.events[name]; !ok { if _, ok := r.events[name]; !ok {
r.events[name] = list.New() r.events[name] = list.New()
@ -75,7 +75,7 @@ func (r *registry) AddHandler(h Handler, names ...string) {
for e := r.events[name].Front(); e != nil; e = e.Next() { for e := r.events[name].Front(); e != nil; e = e.Next() {
// Check we're not adding a duplicate handler to this event // Check we're not adding a duplicate handler to this event
if e.Value.(Handler).Id() == h.Id() { if e.Value.(Handler).Id() == h.Id() {
return continue N
} }
} }
r.events[name].PushBack(h) r.events[name].PushBack(h)
@ -99,6 +99,7 @@ func (r *registry) DelHandler(h Handler, names ...string) {
} }
} else { } else {
for _, name := range names { for _, name := range names {
name = strings.ToLower(name)
if l, ok := r.events[name]; ok { if l, ok := r.events[name]; ok {
_del(l, h.Id()) _del(l, h.Id())
} }
@ -107,13 +108,13 @@ func (r *registry) DelHandler(h Handler, names ...string) {
} }
func (r *registry) Dispatch(name string, ev ...interface{}) { func (r *registry) Dispatch(name string, ev ...interface{}) {
r.dispatcher(r, name, ev...) r.dispatcher(r, strings.ToLower(name), ev...)
} }
func (r *registry) ClearEvents(name string) { func (r *registry) ClearEvents(name string) {
r.Lock() r.Lock()
defer r.Unlock() defer r.Unlock()
if l, ok := r.events[name]; ok { if l, ok := r.events[strings.ToLower(name)]; ok {
l.Init() l.Init()
} }
} }
@ -127,7 +128,6 @@ func (r *registry) Serial() {
} }
func (r *registry) parallelDispatch(name string, ev ...interface{}) { func (r *registry) parallelDispatch(name string, ev ...interface{}) {
name = strings.ToLower(name)
r.RLock() r.RLock()
defer r.RUnlock() defer r.RUnlock()
if l, ok := r.events[name]; ok { if l, ok := r.events[name]; ok {
@ -139,7 +139,6 @@ func (r *registry) parallelDispatch(name string, ev ...interface{}) {
} }
func (r *registry) serialDispatch(name string, ev ...interface{}) { func (r *registry) serialDispatch(name string, ev ...interface{}) {
name = strings.ToLower(name)
r.RLock() r.RLock()
defer r.RUnlock() defer r.RUnlock()
if l, ok := r.events[name]; ok { if l, ok := r.events[name]; ok {