mirror
/
goirc
mirror of https://github.com/fluffle/goirc
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #52 from Krayons/master 

Added timeout to deal with connecting to slow and unreliable IRCservers
This commit is contained in:
Alex Bee 2014-12-20 18:50:39 +00:00
parent 8231942086 5e5f5f0253
commit 57eecccd1b
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
client/connection.go
View File

@ -83,6 +83,9 @@ type Config struct {
// Split PRIVMSGs, NOTICEs and CTCPs longer than // Split PRIVMSGs, NOTICEs and CTCPs longer than
// SplitLen characters over multiple lines. // SplitLen characters over multiple lines.
SplitLen int SplitLen int
// Timeout, The amount of time in seconds until a timeout is triggered.
Timeout time.Duration
} }
func NewConfig(nick string, args ...string) *Config { func NewConfig(nick string, args ...string) *Config {
@ -92,6 +95,7 @@ func NewConfig(nick string, args ...string) *Config {
NewNick: func(s string) string { return s + "_" }, NewNick: func(s string) string { return s + "_" },
Recover: (*Conn).LogPanic, // in dispatch.go Recover: (*Conn).LogPanic, // in dispatch.go
SplitLen: 450, SplitLen: 450,
Timeout: 60 * time.Second,
} }
cfg.Me.Ident = "goirc" cfg.Me.Ident = "goirc"
if len(args) > 0 && args[0] != "" { if len(args) > 0 && args[0] != "" {
@ -124,6 +128,7 @@ func Client(cfg *Config) *Conn {
} }
dialer := new(net.Dialer) dialer := new(net.Dialer)
dialer.Timeout = cfg.Timeout
if cfg.LocalAddr != "" { if cfg.LocalAddr != "" {
if !hasPort(cfg.LocalAddr) { if !hasPort(cfg.LocalAddr) {
cfg.LocalAddr += ":0" cfg.LocalAddr += ":0"