From 935f6e6c20dd56d8c73c5ae61302b08fcec01638 Mon Sep 17 00:00:00 2001 From: Matthias Radestock Date: Tue, 25 Jul 2017 21:20:39 +0100 Subject: [PATCH 1/2] maximize report publishing timeout If the app really does take a long time to process reports, it is better not to time out and send it more reports. However, we do want to send at least one report per app.window, otherwise the scope UI will go blank. Fixes #2464 (as much as is practically possible) --- probe/appclient/app_client.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/probe/appclient/app_client.go b/probe/appclient/app_client.go index ac3fee5154..04c77dd454 100644 --- a/probe/appclient/app_client.go +++ b/probe/appclient/app_client.go @@ -19,7 +19,7 @@ import ( ) const ( - httpClientTimeout = 4 * time.Second + httpClientTimeout = 12 * time.Second // a bit less than default app.window initialBackoff = 1 * time.Second maxBackoff = 60 * time.Second ) From d8c747ef2064040e79cb8c8beb1c166dd80a6e9d Mon Sep 17 00:00:00 2001 From: Matthias Radestock Date: Tue, 25 Jul 2017 21:29:18 +0100 Subject: [PATCH 2/2] downgrade "Dropping report" log message to warning It indicates degraded functionality, not catastrophe. --- probe/appclient/app_client.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/probe/appclient/app_client.go b/probe/appclient/app_client.go index 04c77dd454..7cde8cb00f 100644 --- a/probe/appclient/app_client.go +++ b/probe/appclient/app_client.go @@ -318,7 +318,7 @@ func (c *appClient) Publish(r io.Reader, shortcut bool) error { select { case c.readers <- r: default: - log.Errorf("Dropping report to %s", c.hostname) + log.Warnf("Dropping report to %s", c.hostname) if shortcut { return nil }