Unregistering sessions on acceptor stop

SNORRIS721 · SNORRIS721 · commit cf3fb987067e · 2024-05-03T13:50:51.000-05:00
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.

Original file line number	Diff line number	Diff line change
`@@ -144,6 +144,13 @@ func (a *Acceptor) Stop() {`
`144`	`144`	`session.stop()`
`145`	`145`	`}`
`146`	`146`	`a.sessionGroup.Wait()`
	`147`	`+`
	`148`	`+ for sessionID := range a.sessions {`
	`149`	`+ err := UnregisterSession(sessionID)`
	`150`	`+ if err != nil {`
	`151`	`+ return`
	`152`	`+ }`
	`153`	`+ }`
`147`	`154`	`}`
`148`	`155`
`149`	`156`	`// RemoteAddr gets remote IP address for a given session.`
Original file line number	Diff line number	Diff line change
`@@ -74,14 +74,14 @@ func (i *Initiator) Stop() {`
`74`	`74`	`}`
`75`	`75`	`close(i.stopChan)`
`76`	`76`
	`77`	`+ i.wg.Wait()`
	`78`	`+`
`77`	`79`	`for sessionID := range i.sessionSettings {`
`78`	`80`	`err := UnregisterSession(sessionID)`
`79`	`81`	`if err != nil {`
`80`	`82`	`return`
`81`	`83`	`}`
`82`	`84`	`}`
`83`		`-`
`84`		`- i.wg.Wait()`
`85`	`85`	`}`
`86`	`86`
`87`	`87`	`// NewInitiator creates and initializes a new Initiator.`