diff options
Diffstat (limited to 'telegram')
| -rw-r--r-- | telegram/client.go | 2 | ||||
| -rw-r--r-- | telegram/connect.go | 11 |
2 files changed, 7 insertions, 6 deletions
diff --git a/telegram/client.go b/telegram/client.go index 49816db..71d8125 100644 --- a/telegram/client.go +++ b/telegram/client.go @@ -63,7 +63,7 @@ type Client struct { } type clientLocks struct { - authorizationReady sync.WaitGroup + authorizationReady sync.Mutex chatMessageLocks map[int64]*sync.Mutex resourcesLock sync.Mutex } diff --git a/telegram/connect.go b/telegram/connect.go index ed0a46b..0b9a195 100644 --- a/telegram/connect.go +++ b/telegram/connect.go @@ -96,11 +96,14 @@ func (stateHandler *clientAuthorizer) Close() { // Connect starts TDlib connection func (c *Client) Connect(resource string) error { + log.Warn("Attempting to connect to Telegram network...") + // avoid conflict if another authorization is pending already - c.locks.authorizationReady.Wait() + c.locks.authorizationReady.Lock() if c.Online() { c.roster(resource) + c.locks.authorizationReady.Unlock() return nil } @@ -116,15 +119,13 @@ func (c *Client) Connect(resource string) error { LastName: make(chan string, 1), } - c.locks.authorizationReady.Add(1) - go c.interactor() c.authorizer.TdlibParameters <- c.parameters tdlibClient, err := client.NewClient(c.authorizer, c.options...) if err != nil { - c.locks.authorizationReady.Done() + c.locks.authorizationReady.Unlock() return errors.Wrap(err, "Couldn't initialize a Telegram client instance") } @@ -142,7 +143,7 @@ func (c *Client) Connect(resource string) error { go c.updateHandler() c.online = true - c.locks.authorizationReady.Done() + c.locks.authorizationReady.Unlock() c.addResource(resource) go func() { |