Gateway: Possible bug fix, added more verbose debugging
This commit is contained in:
parent
3d47bada07
commit
01e52334c6
|
@ -173,6 +173,10 @@ func (g *Gateway) Close() error {
|
||||||
WSDebug("Stopped pacemaker.")
|
WSDebug("Stopped pacemaker.")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
WSDebug("Closing the websocket.")
|
||||||
|
err := g.WS.Close()
|
||||||
|
g.AfterClose(err)
|
||||||
|
|
||||||
WSDebug("Waiting for WaitGroup to be done.")
|
WSDebug("Waiting for WaitGroup to be done.")
|
||||||
|
|
||||||
// This should work, since Pacemaker should signal its loop to stop, which
|
// This should work, since Pacemaker should signal its loop to stop, which
|
||||||
|
@ -182,10 +186,8 @@ func (g *Gateway) Close() error {
|
||||||
// Mark g.waitGroup as empty:
|
// Mark g.waitGroup as empty:
|
||||||
g.waitGroup = nil
|
g.waitGroup = nil
|
||||||
|
|
||||||
WSDebug("WaitGroup is done. Closing the websocket.")
|
WSDebug("WaitGroup is done.")
|
||||||
|
|
||||||
err := g.WS.Close()
|
|
||||||
g.AfterClose(err)
|
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -335,6 +337,7 @@ func (g *Gateway) start() error {
|
||||||
func (g *Gateway) handleWS() {
|
func (g *Gateway) handleWS() {
|
||||||
err := g.eventLoop()
|
err := g.eventLoop()
|
||||||
g.waitGroup.Done()
|
g.waitGroup.Done()
|
||||||
|
WSDebug("Event loop stopped.")
|
||||||
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
g.ErrorLog(err)
|
g.ErrorLog(err)
|
||||||
|
|
|
@ -75,10 +75,14 @@ func (p *Pacemaker) start() error {
|
||||||
p.Echo()
|
p.Echo()
|
||||||
|
|
||||||
for {
|
for {
|
||||||
|
WSDebug("Pacemaker loop restarted.")
|
||||||
|
|
||||||
if err := p.Pace(); err != nil {
|
if err := p.Pace(); err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
|
WSDebug("Paced.")
|
||||||
|
|
||||||
// Paced, save:
|
// Paced, save:
|
||||||
atomic.StoreInt64(&p.SentBeat, time.Now().UnixNano())
|
atomic.StoreInt64(&p.SentBeat, time.Now().UnixNano())
|
||||||
|
|
||||||
|
@ -88,9 +92,11 @@ func (p *Pacemaker) start() error {
|
||||||
|
|
||||||
select {
|
select {
|
||||||
case <-p.stop:
|
case <-p.stop:
|
||||||
|
WSDebug("Received stop signal.")
|
||||||
return nil
|
return nil
|
||||||
|
|
||||||
case <-tick.C:
|
case <-tick.C:
|
||||||
|
WSDebug("Ticked. Restarting.")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue