From 2ec8968b82b93bcec95dd956ce1b983c6c8c5bab Mon Sep 17 00:00:00 2001 From: prestonvanloon Date: Wed, 28 Sep 2022 14:07:23 -0500 Subject: [PATCH 1/3] Send email even when the additional data fails --- events-monitor/main.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/events-monitor/main.go b/events-monitor/main.go index fc4d7d8..1ed6336 100644 --- a/events-monitor/main.go +++ b/events-monitor/main.go @@ -222,12 +222,12 @@ func monitorEvents(ctx context.Context, sender emailSender) error { forkchoiceDump, err := getForkchoiceDump(monitorFlags.httpEndpoint) if err != nil { log.WithError(err).Error("Could not get forkchoice dump data") - continue + forkchoiceDump = []byte("Could not get forkchoice dump data") // Send something to avoid empty email. } evData, err := json.Marshal(ev) if err != nil { log.WithError(err).Error("Could marshal event") - continue + evData = []byte("Could marshal event") // Send error as data. } if err := sendJSONEmail(sender, "chain_reorg", evData, forkchoiceDump); err != nil { log.WithError(err).Error("Could not send chain_reorg event as email attachment") From 09870695cbc7bfd9fad46e3e750b697c3c253737 Mon Sep 17 00:00:00 2001 From: prestonvanloon Date: Wed, 28 Sep 2022 14:09:22 -0500 Subject: [PATCH 2/3] fix message --- events-monitor/main.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/events-monitor/main.go b/events-monitor/main.go index 1ed6336..3757f1a 100644 --- a/events-monitor/main.go +++ b/events-monitor/main.go @@ -226,8 +226,8 @@ func monitorEvents(ctx context.Context, sender emailSender) error { } evData, err := json.Marshal(ev) if err != nil { - log.WithError(err).Error("Could marshal event") - evData = []byte("Could marshal event") // Send error as data. + log.WithError(err).Error("Could not marshal event") + evData = []byte("Could not marshal event") // Send error as data. } if err := sendJSONEmail(sender, "chain_reorg", evData, forkchoiceDump); err != nil { log.WithError(err).Error("Could not send chain_reorg event as email attachment") From 60f8398a4e5c9edfca6a5d9d2b0123799de29ecf Mon Sep 17 00:00:00 2001 From: prestonvanloon Date: Wed, 28 Sep 2022 14:09:26 -0500 Subject: [PATCH 3/3] Use go 1.19 --- events-monitor/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/events-monitor/Dockerfile b/events-monitor/Dockerfile index 6d8e5d8..7d9ce1b 100644 --- a/events-monitor/Dockerfile +++ b/events-monitor/Dockerfile @@ -1,5 +1,5 @@ # Accept the Go version for the image to be set as a build argument. -ARG GO_VERSION=1.18 +ARG GO_VERSION=1.19 # First stage: build the executable. FROM golang:${GO_VERSION}-alpine AS builder