mirror of
https://github.com/cwinfo/matterbridge.git
synced 2024-11-14 03:50:26 +00:00
Make reconnection more robust (irc). #153
This commit is contained in:
parent
2a403f8b85
commit
75fb2b8156
@ -23,6 +23,7 @@ type Birc struct {
|
|||||||
connected chan struct{}
|
connected chan struct{}
|
||||||
Local chan config.Message // local queue for flood control
|
Local chan config.Message // local queue for flood control
|
||||||
Account string
|
Account string
|
||||||
|
FirstConnection bool
|
||||||
}
|
}
|
||||||
|
|
||||||
var flog *log.Entry
|
var flog *log.Entry
|
||||||
@ -49,6 +50,7 @@ func New(cfg config.Protocol, account string, c chan config.Message) *Birc {
|
|||||||
if b.Config.MessageLength == 0 {
|
if b.Config.MessageLength == 0 {
|
||||||
b.Config.MessageLength = 400
|
b.Config.MessageLength = 400
|
||||||
}
|
}
|
||||||
|
b.FirstConnection = true
|
||||||
return b
|
return b
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -74,6 +76,8 @@ func (b *Birc) Connect() error {
|
|||||||
i.SASLLogin = b.Config.NickServNick
|
i.SASLLogin = b.Config.NickServNick
|
||||||
i.SASLPassword = b.Config.NickServPassword
|
i.SASLPassword = b.Config.NickServPassword
|
||||||
i.TLSConfig = &tls.Config{InsecureSkipVerify: b.Config.SkipTLSVerify}
|
i.TLSConfig = &tls.Config{InsecureSkipVerify: b.Config.SkipTLSVerify}
|
||||||
|
i.KeepAlive = time.Minute
|
||||||
|
i.PingFreq = time.Minute
|
||||||
if b.Config.Password != "" {
|
if b.Config.Password != "" {
|
||||||
i.Password = b.Config.Password
|
i.Password = b.Config.Password
|
||||||
}
|
}
|
||||||
@ -90,6 +94,14 @@ func (b *Birc) Connect() error {
|
|||||||
return fmt.Errorf("connection timed out")
|
return fmt.Errorf("connection timed out")
|
||||||
}
|
}
|
||||||
i.Debug = false
|
i.Debug = false
|
||||||
|
// clear on reconnects
|
||||||
|
i.ClearCallback(ircm.RPL_WELCOME)
|
||||||
|
i.AddCallback(ircm.RPL_WELCOME, func(event *irc.Event) {
|
||||||
|
b.Remote <- config.Message{Username: "system", Text: "rejoin", Channel: "", Account: b.Account, Event: config.EVENT_REJOIN_CHANNELS}
|
||||||
|
// set our correct nick on reconnect if necessary
|
||||||
|
b.Nick = event.Nick
|
||||||
|
})
|
||||||
|
go i.Loop()
|
||||||
go b.doSend()
|
go b.doSend()
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
@ -217,6 +229,11 @@ func (b *Birc) handleOther(event *irc.Event) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (b *Birc) handlePrivMsg(event *irc.Event) {
|
func (b *Birc) handlePrivMsg(event *irc.Event) {
|
||||||
|
b.Nick = b.i.GetNick()
|
||||||
|
// freenode doesn't send 001 as first reply
|
||||||
|
if event.Code == "NOTICE" {
|
||||||
|
return
|
||||||
|
}
|
||||||
// don't forward queries to the bot
|
// don't forward queries to the bot
|
||||||
if event.Arguments[0] == b.Nick {
|
if event.Arguments[0] == b.Nick {
|
||||||
return
|
return
|
||||||
|
Loading…
Reference in New Issue
Block a user