From 4ff4d46c6d9cdee4be7e9769c1c2dc69bb056f4b Mon Sep 17 00:00:00 2001 From: Steven Willis Date: Tue, 27 Nov 2018 10:25:08 -0500 Subject: [PATCH] Formatting --- influxql.go | 4 +-- integrations/streamer_test.go | 12 ++++---- server/server_test.go | 54 +++++++++++++++++------------------ services/httpd/service.go | 2 +- services/telegram/config.go | 2 +- 5 files changed, 37 insertions(+), 37 deletions(-) diff --git a/influxql.go b/influxql.go index 103656af98..e730353561 100644 --- a/influxql.go +++ b/influxql.go @@ -27,8 +27,8 @@ type InfluxQLNode struct { func newInfluxQLNode(et *ExecutingTask, n *pipeline.InfluxQLNode, d NodeDiagnostic) (*InfluxQLNode, error) { m := &InfluxQLNode{ - node: node{Node: n, et: et, diag: d}, - n: n, + node: node{Node: n, et: et, diag: d}, + n: n, isStreamTransformation: n.ReduceCreater.IsStreamTransformation, } m.node.runF = m.runInfluxQL diff --git a/integrations/streamer_test.go b/integrations/streamer_test.go index 376e6705fc..286c2f2258 100644 --- a/integrations/streamer_test.go +++ b/integrations/streamer_test.go @@ -10116,9 +10116,9 @@ Value: {{ index .Fields "count" }} "Mime-Version": []string{"1.0"}, "Content-Type": []string{"text/html; charset=UTF-8"}, "Content-Transfer-Encoding": []string{"quoted-printable"}, - "To": []string{"user1@example.com, user2@example.com"}, - "From": []string{"test@example.com"}, - "Subject": []string{"kapacitor.cpu.serverA is CRITICAL"}, + "To": []string{"user1@example.com, user2@example.com"}, + "From": []string{"test@example.com"}, + "Subject": []string{"kapacitor.cpu.serverA is CRITICAL"}, }, Body: ` kapacitor.cpu.serverA is CRITICAL @@ -10132,9 +10132,9 @@ Value: 10 "Mime-Version": []string{"1.0"}, "Content-Type": []string{"text/html; charset=UTF-8"}, "Content-Transfer-Encoding": []string{"quoted-printable"}, - "To": []string{"user1@example.com, user2@example.com"}, - "From": []string{"test@example.com"}, - "Subject": []string{"kapacitor.cpu.serverA is CRITICAL"}, + "To": []string{"user1@example.com, user2@example.com"}, + "From": []string{"test@example.com"}, + "Subject": []string{"kapacitor.cpu.serverA is CRITICAL"}, }, Body: ` kapacitor.cpu.serverA is CRITICAL diff --git a/server/server_test.go b/server/server_test.go index 81d97e2cf0..c258346e80 100644 --- a/server/server_test.go +++ b/server/server_test.go @@ -6671,12 +6671,12 @@ func TestServer_UpdateConfig(t *testing.T) { Elements: []client.ConfigElement{{ Link: client.Link{Relation: client.Self, Href: "/kapacitor/v1/config/alerta/"}, Options: map[string]interface{}{ - "enabled": false, - "environment": "", - "origin": "", - "token": false, - "token-prefix": "", - "url": "http://alerta.example.com", + "enabled": false, + "environment": "", + "origin": "", + "token": false, + "token-prefix": "", + "url": "http://alerta.example.com", "insecure-skip-verify": false, "timeout": "0s", }, @@ -6688,12 +6688,12 @@ func TestServer_UpdateConfig(t *testing.T) { expDefaultElement: client.ConfigElement{ Link: client.Link{Relation: client.Self, Href: "/kapacitor/v1/config/alerta/"}, Options: map[string]interface{}{ - "enabled": false, - "environment": "", - "origin": "", - "token": false, - "token-prefix": "", - "url": "http://alerta.example.com", + "enabled": false, + "environment": "", + "origin": "", + "token": false, + "token-prefix": "", + "url": "http://alerta.example.com", "insecure-skip-verify": false, "timeout": "0s", }, @@ -6715,12 +6715,12 @@ func TestServer_UpdateConfig(t *testing.T) { Elements: []client.ConfigElement{{ Link: client.Link{Relation: client.Self, Href: "/kapacitor/v1/config/alerta/"}, Options: map[string]interface{}{ - "enabled": false, - "environment": "", - "origin": "kapacitor", - "token": true, - "token-prefix": "", - "url": "http://alerta.example.com", + "enabled": false, + "environment": "", + "origin": "kapacitor", + "token": true, + "token-prefix": "", + "url": "http://alerta.example.com", "insecure-skip-verify": false, "timeout": "3h0m0s", }, @@ -6732,12 +6732,12 @@ func TestServer_UpdateConfig(t *testing.T) { expElement: client.ConfigElement{ Link: client.Link{Relation: client.Self, Href: "/kapacitor/v1/config/alerta/"}, Options: map[string]interface{}{ - "enabled": false, - "environment": "", - "origin": "kapacitor", - "token": true, - "token-prefix": "", - "url": "http://alerta.example.com", + "enabled": false, + "environment": "", + "origin": "kapacitor", + "token": true, + "token-prefix": "", + "url": "http://alerta.example.com", "insecure-skip-verify": false, "timeout": "3h0m0s", }, @@ -10115,9 +10115,9 @@ func TestServer_AlertHandlers(t *testing.T) { "Mime-Version": []string{"1.0"}, "Content-Type": []string{"text/html; charset=UTF-8"}, "Content-Transfer-Encoding": []string{"quoted-printable"}, - "To": []string{"oncall@example.com, backup@example.com"}, - "From": []string{"test@example.com"}, - "Subject": []string{"message"}, + "To": []string{"oncall@example.com, backup@example.com"}, + "From": []string{"test@example.com"}, + "Subject": []string{"message"}, }, Body: "details\n", }} diff --git a/services/httpd/service.go b/services/httpd/service.go index 1e502dbd86..afa1e9f7c5 100644 --- a/services/httpd/service.go +++ b/services/httpd/service.go @@ -129,7 +129,7 @@ func NewService(c Config, hostname string, d Diagnostic) *Service { d, "", ), - diag: d, + diag: d, httpServerErrorLogger: d.NewHTTPServerErrorLogger(), } if s.key == "" { diff --git a/services/telegram/config.go b/services/telegram/config.go index 606a7e1ea7..c4eaa8e75a 100644 --- a/services/telegram/config.go +++ b/services/telegram/config.go @@ -34,7 +34,7 @@ type Config struct { func NewConfig() Config { return Config{ - URL: DefaultTelegramURL, + URL: DefaultTelegramURL, DisableWebPagePreview: DefaultTelegramLinksPreviewDisable, DisableNotification: DefaultTelegramNotificationDisable, }