narayana/go-xmpp
2
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix passing Component to StreamManager

Browse source 
0a4acd12c3, which fixes #160, introduced
a regression as it assumed only Client may implement StreamClient, and
passing a component triggers an unconditional "client is not
disconnected" error.
This commit is contained in:
Bohdan Horbeshko 2021-12-18 10:33:13 -05:00
parent 5f99e1cd06
commit e55463fc98
1 changed files with 16 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
stream_manager.go
View file

@ -114,18 +114,23 @@ func (sm *StreamManager) Stop() {
func (sm *StreamManager) connect() error { func (sm *StreamManager) connect() error {
if sm.client != nil { if sm.client != nil {
if c, ok := sm.client.(*Client); ok { var scs *SyncConnState
if c.CurrentState.getState() == StateDisconnected { if client, ok := sm.client.(*Client); ok {
sm.Metrics = initMetrics() scs = &client.CurrentState
err := c.Connect() }
if err != nil { if component, ok := sm.client.(*Component); ok {
return err scs = &component.CurrentState
} }
if sm.PostConnect != nil { if scs != nil && scs.getState() == StateDisconnected {
sm.PostConnect(sm.client) sm.Metrics = initMetrics()
} err := sm.client.Connect()
return nil if err != nil {
return err
} }
if sm.PostConnect != nil {
sm.PostConnect(sm.client)
}
return nil
} }
} }
return errors.New("client is not disconnected") return errors.New("client is not disconnected")