diff --git a/caddyhttp/httpserver/server.go b/caddyhttp/httpserver/server.go index de53cea08..6ec6eff32 100644 --- a/caddyhttp/httpserver/server.go +++ b/caddyhttp/httpserver/server.go @@ -507,16 +507,34 @@ func (s *Server) Stop() error { // OnStartupComplete lists the sites served by this server // and any relevant information, assuming caddy.Quiet == false. func (s *Server) OnStartupComplete() { - if caddy.Quiet { - return + if !caddy.Quiet { + firstSite := s.sites[0] + scheme := "HTTP" + if firstSite.TLS.Enabled { + scheme = "HTTPS" + } + + fmt.Println("") + fmt.Printf("Serving %s on port "+firstSite.Port()+" \n", scheme) + s.outputSiteInfo(false) + fmt.Println("") } + + // Print out process log without header comment + s.outputSiteInfo(true) +} + +func (s *Server) outputSiteInfo(isProcessLog bool) { for _, site := range s.sites { output := site.Addr.String() if caddy.IsLoopback(s.Address()) && !caddy.IsLoopback(site.Addr.Host) { output += " (only accessible on this machine)" } - fmt.Println(output) - log.Println(output) + if isProcessLog { + log.Printf("[INFO] Serving %s \n", output) + } else { + fmt.Println(output) + } } }