fix agent logic

f0ssel · f0ssel · commit 5aedcdc5354b · 2022-09-22T21:09:34.000Z
diff --git a/agent/apphealth.go b/agent/apphealth.go
@@ -67,7 +67,7 @@ func NewWorkspaceAppHealthReporter(logger slog.Logger, client *codersdk.Client)
 								}
 
 								client := &http.Client{
-									Timeout: time.Duration(app.Healthcheck.Interval),
+									Timeout: time.Duration(time.Duration(app.Healthcheck.Interval) * time.Second),
 								}
 								err := func() error {
 									req, err := http.NewRequestWithContext(ctx, http.MethodGet, app.Healthcheck.URL, nil)
@@ -85,9 +85,11 @@ func NewWorkspaceAppHealthReporter(logger slog.Logger, client *codersdk.Client)
 
 									return nil
 								}()
-								if err == nil {
+								if err != nil {
+									logger.Debug(ctx, "failed healthcheck", slog.Error(err), slog.F("app", app))
 									mu.Lock()
 									failures[app.Name]++
+									logger.Debug(ctx, "failed healthcheck", slog.Error(err), slog.F("app", app), slog.F("failures", failures[app.Name]))
 									if failures[app.Name] > int(app.Healthcheck.Threshold) {
 										health[app.Name] = codersdk.WorkspaceAppHealthUnhealthy
 									}

Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,7 @@ func NewWorkspaceAppHealthReporter(logger slog.Logger, client *codersdk.Client)`
`67`	`67`	`}`
`68`	`68`
`69`	`69`	`client := &http.Client{`
`70`		`- Timeout: time.Duration(app.Healthcheck.Interval),`
	`70`	`+ Timeout: time.Duration(time.Duration(app.Healthcheck.Interval) * time.Second),`
`71`	`71`	`}`
`72`	`72`	`err := func() error {`
`73`	`73`	`req, err := http.NewRequestWithContext(ctx, http.MethodGet, app.Healthcheck.URL, nil)`
`@@ -85,9 +85,11 @@ func NewWorkspaceAppHealthReporter(logger slog.Logger, client *codersdk.Client)`
`85`	`85`
`86`	`86`	`return nil`
`87`	`87`	`}()`
`88`		`- if err == nil {`
	`88`	`+ if err != nil {`
	`89`	`+ logger.Debug(ctx, "failed healthcheck", slog.Error(err), slog.F("app", app))`
`89`	`90`	`mu.Lock()`
`90`	`91`	`failures[app.Name]++`
	`92`	`+ logger.Debug(ctx, "failed healthcheck", slog.Error(err), slog.F("app", app), slog.F("failures", failures[app.Name]))`
`91`	`93`	`if failures[app.Name] > int(app.Healthcheck.Threshold) {`
`92`	`94`	`health[app.Name] = codersdk.WorkspaceAppHealthUnhealthy`
`93`	`95`	`}`