Merge pull request #6 from rubyist/master

Unexpected client disconnections can cause a panic and crash the server
This commit is contained in:
Naitik Shah 2013-11-04 08:50:03 -08:00
commit bb439ce0e5

View File

@ -60,10 +60,11 @@ type deadliner interface {
type conn struct {
net.Conn
wg *sync.WaitGroup
once sync.Once
}
func (c conn) Close() error {
defer c.wg.Done()
func (c *conn) Close() error {
defer c.once.Do(c.wg.Done)
return c.Conn.Close()
}
@ -133,7 +134,7 @@ func (l *listener) Accept() (net.Conn, error) {
}
return nil, err
}
return conn{Conn: c, wg: &l.wg}, nil
return &conn{Conn: c, wg: &l.wg}, nil
}
type Process struct {