From e14cc292ed8f51c00f806ffd730093ebd0c2df5b Mon Sep 17 00:00:00 2001
From: Juho-Pekka Kuitunen <artanicus@nocturnal.fi>
Date: Mon, 29 Nov 2021 16:07:26 +0200
Subject: [PATCH] feat: improve HTTP API logging, honor no-startup-message
 (#1091)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: nils måsén <nils@piksel.se>
---
 cmd/root.go    | 15 ++++++++++++++-
 pkg/api/api.go |  2 --
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/cmd/root.go b/cmd/root.go
index ff1cac3..1be52a8 100644
--- a/cmd/root.go
+++ b/cmd/root.go
@@ -191,6 +191,11 @@ func Run(c *cobra.Command, names []string) {
 	if enableUpdateAPI {
 		updateHandler := update.New(func() { runUpdatesWithNotifications(filter) }, updateLock)
 		httpAPI.RegisterFunc(updateHandler.Path, updateHandler.Handle)
+		// If polling isn't enabled the scheduler is never started and
+		// we need to trigger the startup messages manually.
+		if !unblockHTTPAPI {
+			writeStartupMessage(c, time.Time{}, filterDesc)
+		}
 	}
 
 	if enableMetricsAPI {
@@ -261,6 +266,7 @@ func formatDuration(d time.Duration) string {
 
 func writeStartupMessage(c *cobra.Command, sched time.Time, filtering string) {
 	noStartupMessage, _ := c.PersistentFlags().GetBool("no-startup-message")
+	enableUpdateAPI, _ := c.PersistentFlags().GetBool("http-api-update")
 
 	var startupLog *log.Entry
 	if noStartupMessage {
@@ -286,8 +292,15 @@ func writeStartupMessage(c *cobra.Command, sched time.Time, filtering string) {
 		until := formatDuration(time.Until(sched))
 		startupLog.Info("Scheduling first run: " + sched.Format("2006-01-02 15:04:05 -0700 MST"))
 		startupLog.Info("Note that the first check will be performed in " + until)
+	} else if runOnce, _ := c.PersistentFlags().GetBool("run-once"); runOnce {
+			startupLog.Info("Running a one time update.")
 	} else {
-		startupLog.Info("Running a one time update.")
+		startupLog.Info("Periodic runs are not enabled.")
+	}
+
+	if enableUpdateAPI {
+		// TODO: make listen port configurable
+		startupLog.Info("The HTTP API is enabled at :8080.")
 	}
 
 	if !noStartupMessage {
diff --git a/pkg/api/api.go b/pkg/api/api.go
index 756db90..d0c4a95 100644
--- a/pkg/api/api.go
+++ b/pkg/api/api.go
@@ -62,7 +62,6 @@ func (api *API) Start(block bool) error {
 		log.Fatal(tokenMissingMsg)
 	}
 
-	log.Info("Watchtower HTTP API started.")
 	if block {
 		runHTTPServer()
 	} else {
@@ -74,6 +73,5 @@ func (api *API) Start(block bool) error {
 }
 
 func runHTTPServer() {
-	log.Info("Serving HTTP")
 	log.Fatal(http.ListenAndServe(":8080", nil))
 }