From 163f55f9c27e9e8a75774424d22598799e8306c6 Mon Sep 17 00:00:00 2001 From: Wim Date: Tue, 14 Feb 2017 21:12:02 +0100 Subject: Refactor to handle disconnects/reconnects better. Now try to reconnect every 60 seconds until forever. --- bridge/irc/irc.go | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) (limited to 'bridge/irc') diff --git a/bridge/irc/irc.go b/bridge/irc/irc.go index fe8dc741..db430800 100644 --- a/bridge/irc/irc.go +++ b/bridge/irc/irc.go @@ -46,7 +46,6 @@ func New(cfg config.Protocol, account string, c chan config.Message) *Birc { if b.Config.MessageQueue == 0 { b.Config.MessageQueue = 30 } - b.Local = make(chan config.Message, b.Config.MessageQueue+10) return b } @@ -61,6 +60,7 @@ func (b *Birc) Command(msg *config.Message) string { } func (b *Birc) Connect() error { + b.Local = make(chan config.Message, b.Config.MessageQueue+10) flog.Infof("Connecting %s", b.Config.Server) i := irc.IRC(b.Config.Nick, b.Config.Nick) if log.GetLevel() == log.DebugLevel { @@ -91,6 +91,12 @@ func (b *Birc) Connect() error { return nil } +func (b *Birc) Disconnect() error { + b.i.Disconnect() + close(b.Local) + return nil +} + func (b *Birc) JoinChannel(channel string) error { b.i.Join(channel) return nil @@ -170,7 +176,11 @@ func (b *Birc) handleJoinPart(event *irc.Event) { flog.Debugf("Sending JOIN_LEAVE event from %s to gateway", b.Account) channel := event.Arguments[0] if event.Code == "QUIT" { - channel = "" + if event.Nick == b.Nick && strings.Contains(event.Raw, "Ping timeout") { + flog.Infof("%s reconnecting ..", b.Account) + b.Remote <- config.Message{Username: "system", Text: "reconnect", Channel: channel, Account: b.Account, Event: config.EVENT_FAILURE} + return + } } b.Remote <- config.Message{Username: "system", Text: event.Nick + " " + strings.ToLower(event.Code) + "s", Channel: channel, Account: b.Account, Event: config.EVENT_JOIN_LEAVE} flog.Debugf("handle %#v", event) -- cgit v1.2.3