Skip to content

Commit

Permalink
feat: improve HTTP API logging, honor no-startup-message (#1091)
Browse files Browse the repository at this point in the history
Co-authored-by: nils måsén <nils@piksel.se>
  • Loading branch information
jinnatar and piksel committed Nov 29, 2021
1 parent b3b45ab commit e14cc29
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 3 deletions.
15 changes: 14 additions & 1 deletion cmd/root.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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 {
Expand All @@ -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 {
Expand Down
2 changes: 0 additions & 2 deletions pkg/api/api.go
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,6 @@ func (api *API) Start(block bool) error {
log.Fatal(tokenMissingMsg)
}

log.Info("Watchtower HTTP API started.")
if block {
runHTTPServer()
} else {
Expand All @@ -74,6 +73,5 @@ func (api *API) Start(block bool) error {
}

func runHTTPServer() {
log.Info("Serving HTTP")
log.Fatal(http.ListenAndServe(":8080", nil))
}

0 comments on commit e14cc29

Please sign in to comment.