mirror of
https://github.com/FluuxIO/go-xmpp.git
synced 2024-11-24 11:32:00 -08:00
Fix passing Component to StreamManager
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:
parent
5f99e1cd06
commit
e55463fc98
@ -114,10 +114,16 @@ 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 {
|
||||||
|
scs = &client.CurrentState
|
||||||
|
}
|
||||||
|
if component, ok := sm.client.(*Component); ok {
|
||||||
|
scs = &component.CurrentState
|
||||||
|
}
|
||||||
|
if scs != nil && scs.getState() == StateDisconnected {
|
||||||
sm.Metrics = initMetrics()
|
sm.Metrics = initMetrics()
|
||||||
err := c.Connect()
|
err := sm.client.Connect()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
@ -127,7 +133,6 @@ func (sm *StreamManager) connect() error {
|
|||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
return errors.New("client is not disconnected")
|
return errors.New("client is not disconnected")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user