sad/soju
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Retry connecting to upstream servers

Browse Source 
Rate-limit retries in case connecting immediately fails.
This commit is contained in:
Simon Ser 2020-03-03 15:26:19 +01:00
parent 6e12347f2b
commit c366b5320c
No known key found for this signature in database
GPG Key ID: 0FDE7BE0E88F5E48
1 changed files with 40 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
server.go
View File

@ -12,6 +12,7 @@ import (
// TODO: make configurable
var keepAlivePeriod = time.Minute
var retryConnectMinDelay = time.Minute
func setKeepAlive(c net.Conn) error {
tcpConn, ok := c.(*net.TCPConn)
@ -137,6 +138,44 @@ func (s *Server) prefix() *irc.Prefix {
return &irc.Prefix{Name: s.Hostname}
}
func (s *Server) runUpstream(u *user, upstream *Upstream) {
var lastTry time.Time
for {
if dur := time.Now().Sub(lastTry); dur < retryConnectMinDelay {
delay := retryConnectMinDelay - dur
s.Logger.Printf("waiting %v before trying to reconnect to %q", delay.Truncate(time.Second), upstream.Addr)
time.Sleep(delay)
}
lastTry = time.Now()
uc, err := connectToUpstream(u, upstream)
if err != nil {
s.Logger.Printf("failed to connect to upstream server %q: %v", upstream.Addr, err)
continue
}
uc.register()
u.lock.Lock()
u.upstreamConns = append(u.upstreamConns, uc)
u.lock.Unlock()
if err := uc.readMessages(); err != nil {
uc.logger.Printf("failed to handle messages: %v", err)
}
uc.Close()
u.lock.Lock()
for i := range u.upstreamConns {
if u.upstreamConns[i] == uc {
u.upstreamConns = append(u.upstreamConns[:i], u.upstreamConns[i+1:]...)
break
}
}
u.lock.Unlock()
}
}
func (s *Server) Run() {
// TODO: multi-user
u := newUser(s, "jounce")
@ -146,35 +185,7 @@ func (s *Server) Run() {
s.lock.Unlock()
for i := range s.Upstreams {
upstream := &s.Upstreams[i]
// TODO: retry connecting
go func() {
uc, err := connectToUpstream(u, upstream)
if err != nil {
s.Logger.Printf("failed to connect to upstream server %q: %v", upstream.Addr, err)
return
}
uc.register()
u.lock.Lock()
u.upstreamConns = append(u.upstreamConns, uc)
u.lock.Unlock()
if err := uc.readMessages(); err != nil {
uc.logger.Printf("failed to handle messages: %v", err)
}
uc.Close()
u.lock.Lock()
for i := range u.upstreamConns {
if u.upstreamConns[i] == uc {
u.upstreamConns = append(u.upstreamConns[:i], u.upstreamConns[i+1:]...)
break
}
}
u.lock.Unlock()
}()
go s.runUpstream(u, &s.Upstreams[i])
}
}