Unregistering sessions on acceptor stop

quickfixgo · May 3, 2024 · cf3fb98 · cf3fb98
1 parent 6659865
commit cf3fb98
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/acceptor.go b/acceptor.go
@@ -144,6 +144,13 @@ func (a *Acceptor) Stop() {
 		session.stop()
 	}
 	a.sessionGroup.Wait()
+
+	for sessionID := range a.sessions {
+		err := UnregisterSession(sessionID)
+		if err != nil {
+			return
+		}
+	}
 }
 
 // RemoteAddr gets remote IP address for a given session.

diff --git a/initiator.go b/initiator.go
@@ -74,14 +74,14 @@ func (i *Initiator) Stop() {
 	}
 	close(i.stopChan)
 
+	i.wg.Wait()
+
 	for sessionID := range i.sessionSettings {
 		err := UnregisterSession(sessionID)
 		if err != nil {
 			return
 		}
 	}
-
-	i.wg.Wait()
 }
 
 // NewInitiator creates and initializes a new Initiator.