faas-rs/faas
1
0
Fork 0
mirror of https://github.com/openfaas/faas.git synced 2025-06-08 16:26:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Consolidate listen / timeout messages

Browse Source 
This brings of-watchdog and the classic watchdog into sync.

Signed-off-by: Alex Ellis <alexellis2@gmail.com>
This commit is contained in:
Alex Ellis 2019-07-11 10:12:19 +01:00
parent c15da33165
commit 481482279c
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
watchdog/main.go
View File

@ -60,7 +60,13 @@ func main() {
}
httpMetrics := metrics.NewHttp()
log.Printf("Read/write timeout: %s, %s. Port: %d\n", readTimeout, writeTimeout, config.port)
log.Printf("Timeouts: read: %s, write: %s hard: %s.\n",
readTimeout,
writeTimeout,
config.execTimeout)
log.Printf("Listening on port: %d\n", config.port)
http.HandleFunc("/_/health", makeHealthHandler())
http.HandleFunc("/", metrics.InstrumentHandler(makeRequestHandler(&config), httpMetrics))

2
watchdog/metrics/metrics.go
View File

@ -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 {