把AddCloseCallback和RemoveCloseCallback改为公开方法，修复Add和Remove行为不一致的设计缺陷

jiangema · Oct 25, 2016 · 1aa2d1d · 1aa2d1d
1 parent 61bb850
commit 1aa2d1d
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 16 deletions.
diff --git a/README.md b/README.md
diff --git a/channel.go b/channel.go
@@ -53,14 +53,14 @@ func (channel *Channel) Put(key KEY, session *Session) {
 	if session, exists := channel.sessions[key]; exists {
 		channel.remove(key, session)
 	}
-	session.addCloseCallback(channel, func() {
+	session.AddCloseCallback(channel, key, func() {
 		channel.Remove(key)
 	})
 	channel.sessions[key] = session
 }
 
 func (channel *Channel) remove(key KEY, session *Session) {
-	session.removeCloseCallback(channel)
+	session.RemoveCloseCallback(channel, key)
 	delete(channel.sessions, key)
 }
 

diff --git a/channel_int32.go b/channel_int32.go
@@ -48,14 +48,14 @@ func (channel *Int32Channel) Put(key int32, session *Session) {
 	if session, exists := channel.sessions[key]; exists {
 		channel.remove(key, session)
 	}
-	session.addCloseCallback(channel, func() {
+	session.AddCloseCallback(channel, key, func() {
 		channel.Remove(key)
 	})
 	channel.sessions[key] = session
 }
 
 func (channel *Int32Channel) remove(key int32, session *Session) {
-	session.removeCloseCallback(channel)
+	session.RemoveCloseCallback(channel, key)
 	delete(channel.sessions, key)
 }
 

diff --git a/channel_int64.go b/channel_int64.go
@@ -48,14 +48,14 @@ func (channel *Int64Channel) Put(key int64, session *Session) {
 	if session, exists := channel.sessions[key]; exists {
 		channel.remove(key, session)
 	}
-	session.addCloseCallback(channel, func() {
+	session.AddCloseCallback(channel, key, func() {
 		channel.Remove(key)
 	})
 	channel.sessions[key] = session
 }
 
 func (channel *Int64Channel) remove(key int64, session *Session) {
-	session.removeCloseCallback(channel)
+	session.RemoveCloseCallback(channel, key)
 	delete(channel.sessions, key)
 }
 

diff --git a/channel_string.go b/channel_string.go
@@ -48,14 +48,14 @@ func (channel *StringChannel) Put(key string, session *Session) {
 	if session, exists := channel.sessions[key]; exists {
 		channel.remove(key, session)
 	}
-	session.addCloseCallback(channel, func() {
+	session.AddCloseCallback(channel, key, func() {
 		channel.Remove(key)
 	})
 	channel.sessions[key] = session
 }
 
 func (channel *StringChannel) remove(key string, session *Session) {
-	session.removeCloseCallback(channel)
+	session.RemoveCloseCallback(channel, key)
 	delete(channel.sessions, key)
 }
 

diff --git a/channel_uint32.go b/channel_uint32.go
@@ -48,14 +48,14 @@ func (channel *Uint32Channel) Put(key uint32, session *Session) {
 	if session, exists := channel.sessions[key]; exists {
 		channel.remove(key, session)
 	}
-	session.addCloseCallback(channel, func() {
+	session.AddCloseCallback(channel, key, func() {
 		channel.Remove(key)
 	})
 	channel.sessions[key] = session
 }
 
 func (channel *Uint32Channel) remove(key uint32, session *Session) {
-	session.removeCloseCallback(channel)
+	session.RemoveCloseCallback(channel, key)
 	delete(channel.sessions, key)
 }
 

diff --git a/channel_uint64.go b/channel_uint64.go
@@ -48,14 +48,14 @@ func (channel *Uint64Channel) Put(key uint64, session *Session) {
 	if session, exists := channel.sessions[key]; exists {
 		channel.remove(key, session)
 	}
-	session.addCloseCallback(channel, func() {
+	session.AddCloseCallback(channel, key, func() {
 		channel.Remove(key)
 	})
 	channel.sessions[key] = session
 }
 
 func (channel *Uint64Channel) remove(key uint64, session *Session) {
-	session.removeCloseCallback(channel)
+	session.RemoveCloseCallback(channel, key)
 	delete(channel.sessions, key)
 }
 

diff --git a/session.go b/session.go
@@ -132,10 +132,11 @@ func (session *Session) Send(msg interface{}) error {
 
 type closeCallback struct {
 	Handler interface{}
+	Key     interface{}
 	Func    func()
 }
 
-func (session *Session) addCloseCallback(handler interface{}, callback func()) {
+func (session *Session) AddCloseCallback(handler, key interface{}, callback func()) {
 	if session.IsClosed() {
 		return
 	}
@@ -147,10 +148,10 @@ func (session *Session) addCloseCallback(handler interface{}, callback func()) {
 		session.closeCallbacks = list.New()
 	}
 
-	session.closeCallbacks.PushBack(closeCallback{handler, callback})
+	session.closeCallbacks.PushBack(&closeCallback{handler, key, callback})
 }
 
-func (session *Session) removeCloseCallback(handler interface{}) {
+func (session *Session) RemoveCloseCallback(handler, key interface{}) {
 	if session.IsClosed() {
 		return
 	}
@@ -159,7 +160,8 @@ func (session *Session) removeCloseCallback(handler interface{}) {
 	defer session.closeMutex.Unlock()
 
 	for i := session.closeCallbacks.Front(); i != nil; i = i.Next() {
-		if i.Value.(closeCallback).Handler == handler {
+		item := i.Value.(*closeCallback)
+		if item.Handler == handler && item.Key == key {
 			session.closeCallbacks.Remove(i)
 			return
 		}