Skip to content

Commit

Permalink
Merge pull request #10296 from dragonchaser/nats-probes
Browse files Browse the repository at this point in the history
add nats checks
  • Loading branch information
2403905 authored Oct 15, 2024
2 parents 7531f16 + 339762b commit b9d77e3
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 1 deletion.
9 changes: 9 additions & 0 deletions ocis-pkg/handlers/checker.go
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,15 @@ func (c CheckHandlerConfiguration) WithCheck(name string, f check) CheckHandlerC
return c
}

// WithInheritedChecksFrom appends the checks from another CheckHandlerConfiguration.
func (c CheckHandlerConfiguration) WithInheritedChecksFrom(other CheckHandlerConfiguration) CheckHandlerConfiguration {
for name, check := range other.checks {
c.WithCheck(name, check)
}

return c
}

// WithLimit limits the number of active goroutines for the checks to at most n
func (c CheckHandlerConfiguration) WithLimit(n int) CheckHandlerConfiguration {
c.limit = n
Expand Down
6 changes: 5 additions & 1 deletion services/nats/pkg/server/debug/server.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package debug

import (
"net/http"
"strconv"

"github.com/owncloud/ocis/v2/ocis-pkg/handlers"
"github.com/owncloud/ocis/v2/ocis-pkg/service/debug"
Expand All @@ -12,9 +13,12 @@ import (
func Server(opts ...Option) (*http.Server, error) {
options := newOptions(opts...)

// For nats readiness and liveness checks are identical
// the nats server will neither be healthy nor ready when it can not reach the nats server/cluster
checkHandler := handlers.NewCheckHandler(
handlers.NewCheckHandlerConfiguration().
WithLogger(options.Logger),
WithLogger(options.Logger).
WithCheck("nats reachability", handlers.NewNatsCheck(options.Config.Nats.Host+":"+strconv.Itoa(options.Config.Nats.Port))),
)

return debug.NewService(
Expand Down

0 comments on commit b9d77e3

Please sign in to comment.