From f33c3da190e86e5401c76a885e1861ae01f9560f Mon Sep 17 00:00:00 2001 From: Blerim Sheqa Date: Fri, 30 Dec 2016 13:36:55 +0100 Subject: [PATCH] Capture EOF and add option for retry interval --- beater/eventstream.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/beater/eventstream.go b/beater/eventstream.go index 3af159b6..745b6ee1 100644 --- a/beater/eventstream.go +++ b/beater/eventstream.go @@ -37,7 +37,7 @@ func NewEventstream(bt *Icingabeat, cfg config.Config) *Eventstream { func (es *Eventstream) Run() error { for { - ticker := time.NewTicker(2 * time.Second) + ticker := time.NewTicker(es.config.RetryInterval) response, responseErr := requestURL(es.icingabeat, "POST", "/v1/events?queue=icingabeat&types=CheckResult") if responseErr == nil { @@ -54,7 +54,7 @@ func (es *Eventstream) Run() error { tst := es.closer == nil es.mutex.Unlock() - if tst { + if tst || err == io.ErrUnexpectedEOF || err == io.EOF { break } logp.Err("Error reading line %#v", err) @@ -68,7 +68,7 @@ func (es *Eventstream) Run() error { tst := es.closer == nil es.mutex.Unlock() - if tst { + if tst || err == io.ErrUnexpectedEOF || err == io.EOF { break } continue @@ -86,7 +86,7 @@ func (es *Eventstream) Run() error { default: } } else { - logp.Info("Error connecting to API:", responseErr) + logp.Info("Error connecting to API: %v", responseErr) } select {