From e4748bdeb59c75b7e5235ad9cea5e9d7b65d17ef Mon Sep 17 00:00:00 2001 From: Alex Ellis Date: Thu, 11 Jul 2019 10:09:15 +0100 Subject: [PATCH] Update and sync listening messages Signed-off-by: Alex Ellis --- main.go | 8 ++++++-- metrics/metrics.go | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/main.go b/main.go index e489a778..2666c360 100644 --- a/main.go +++ b/main.go @@ -62,6 +62,12 @@ func main() { MaxHeaderBytes: 1 << 20, // Max header of 1MB } + log.Printf("Timeouts: read: %s, write: %s hard: %s.\n", + watchdogConfig.HTTPReadTimeout, + watchdogConfig.HTTPWriteTimeout, + watchdogConfig.ExecTimeout) + log.Printf("Listening on port: %d\n", watchdogConfig.TCPPort) + listenUntilShutdown(shutdownTimeout, s, watchdogConfig.SuppressLock) } @@ -107,8 +113,6 @@ func listenUntilShutdown(shutdownTimeout time.Duration, s *http.Server, suppress // Run the HTTP server in a separate go-routine. go func() { - log.Printf("HTTP server. Listen: %v", s.Addr) - if err := s.ListenAndServe(); err != http.ErrServerClosed { log.Printf("Error ListenAndServe: %v", err) close(idleConnsClosed) diff --git a/metrics/metrics.go b/metrics/metrics.go index efdda8a6..18f48b5e 100644 --- a/metrics/metrics.go +++ b/metrics/metrics.go @@ -39,7 +39,7 @@ func (m *MetricsServer) Register(metricsPort int) { // Serve http traffic in go routine, non-blocking func (m *MetricsServer) Serve(cancel chan bool) { - log.Printf("Metrics server. Port: %d\n", m.port) + log.Printf("Metrics listening on port: %d\n", m.port) go func() { if err := m.s.ListenAndServe(); err != http.ErrServerClosed {