From 284f69ad176af8df84fc1ddba628691f4a5635ab Mon Sep 17 00:00:00 2001
From: algonautshant <55754073+algonautshant@users.noreply.github.com>
Date: Mon, 12 Oct 2020 16:41:31 -0400
Subject: [PATCH] Correct Telemetry uploading message reported in node.log
 (#1605)

Correct Telemetry uploading message reported in node.log
---
 daemon/algod/server.go |  4 +++-
 logging/log.go         | 11 +++++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/daemon/algod/server.go b/daemon/algod/server.go
index ab5e629056..a14d0dfe0f 100644
--- a/daemon/algod/server.go
+++ b/daemon/algod/server.go
@@ -103,10 +103,12 @@ func (s *Server) Initialize(cfg config.Local, phonebookAddresses []string, genes
 	// collected metrics decorations.
 	fmt.Fprintln(logWriter, "++++++++++++++++++++++++++++++++++++++++")
 	fmt.Fprintln(logWriter, "Logging Starting")
-	if s.log.GetTelemetryEnabled() {
+	if s.log.GetTelemetryUploadingEnabled() {
+		// May or may not be logging to node.log
 		fmt.Fprintf(logWriter, "Telemetry Enabled: %s\n", s.log.GetTelemetryHostName())
 		fmt.Fprintf(logWriter, "Session: %s\n", s.log.GetTelemetrySession())
 	} else {
+		// May or may not be logging to node.log
 		fmt.Fprintln(logWriter, "Telemetry Disabled")
 	}
 	fmt.Fprintln(logWriter, "++++++++++++++++++++++++++++++++++++++++")
diff --git a/logging/log.go b/logging/log.go
index a500eba5b9..0e358af113 100644
--- a/logging/log.go
+++ b/logging/log.go
@@ -156,6 +156,7 @@ type Logger interface {
 	EnableTelemetry(cfg TelemetryConfig) error
 	UpdateTelemetryURI(uri string) error
 	GetTelemetryEnabled() bool
+	GetTelemetryUploadingEnabled() bool
 	Metrics(category telemetryspec.Category, metrics telemetryspec.MetricDetails, details interface{})
 	Event(category telemetryspec.Category, identifier telemetryspec.Event)
 	EventWithDetails(category telemetryspec.Category, identifier telemetryspec.Event, details interface{})
@@ -380,6 +381,9 @@ func (l logger) UpdateTelemetryURI(uri string) (err error) {
 	return
 }
 
+// GetTelemetryEnabled returns true if
+// logging.config Enable, or SendToLog or config.json
+// TelemetryToLog is true.
 func (l logger) GetTelemetryEnabled() bool {
 	return l.loggerState.telemetry != nil
 }
@@ -400,6 +404,13 @@ func (l logger) GetTelemetryURI() string {
 	return telemetryConfig.URI
 }
 
+// GetTelemetryUploadingEnabled returns true if telemetry logging is
+// enabled for uploading messages.
+// This is decided by Enable parameter in logging.config
+func (l logger) GetTelemetryUploadingEnabled() bool {
+	return telemetryConfig.Enable
+}
+
 func (l logger) Metrics(category telemetryspec.Category, metrics telemetryspec.MetricDetails, details interface{}) {
 	if l.loggerState.telemetry != nil {
 		l.loggerState.telemetry.logMetrics(l, category, metrics, details)