the server probs added to the several services

owncloud · Oct 16, 2024 · d4fe58d · d4fe58d
1 parent 4f8d0bb
commit d4fe58d
Show file tree

Hide file tree

Showing 7 changed files with 67 additions and 8 deletions.
diff --git a/services/audit/pkg/server/debug/server.go b/services/audit/pkg/server/debug/server.go
@@ -17,6 +17,13 @@ func Server(opts ...Option) (*http.Server, error) {
 			WithLogger(options.Logger),
 	)
 
+	readyHandler := handlers.NewCheckHandler(
+		handlers.NewCheckHandlerConfiguration().
+			WithLogger(options.Logger).
+			WithCheck("nats reachability", handlers.NewNatsCheck(options.Config.Events.Cluster)).
+			WithInheritedChecksFrom(checkHandler.Conf),
+	)
+
 	return debug.NewService(
 		debug.Logger(options.Logger),
 		debug.Name(options.Config.Service.Name),
@@ -26,6 +33,6 @@ func Server(opts ...Option) (*http.Server, error) {
 		debug.Pprof(options.Config.Debug.Pprof),
 		debug.Zpages(options.Config.Debug.Zpages),
 		debug.Health(checkHandler),
-		debug.Ready(checkHandler),
+		debug.Ready(readyHandler),
 	), nil
 }
diff --git a/services/clientlog/pkg/server/debug/server.go b/services/clientlog/pkg/server/debug/server.go
@@ -17,6 +17,13 @@ func Server(opts ...Option) (*http.Server, error) {
 			WithLogger(options.Logger),
 	)
 
+	readyHandler := handlers.NewCheckHandler(
+		handlers.NewCheckHandlerConfiguration().
+			WithLogger(options.Logger).
+			WithCheck("nats reachability", handlers.NewNatsCheck(options.Config.Events.Cluster)).
+			WithInheritedChecksFrom(checkHandler.Conf),
+	)
+
 	return debug.NewService(
 		debug.Logger(options.Logger),
 		debug.Name(options.Config.Service.Name),
@@ -26,6 +33,6 @@ func Server(opts ...Option) (*http.Server, error) {
 		debug.Pprof(options.Config.Debug.Pprof),
 		debug.Zpages(options.Config.Debug.Zpages),
 		debug.Health(checkHandler),
-		debug.Ready(checkHandler),
+		debug.Ready(readyHandler),
 	), nil
 }
diff --git a/services/eventhistory/pkg/server/debug/server.go b/services/eventhistory/pkg/server/debug/server.go
@@ -14,7 +14,15 @@ func Server(opts ...Option) (*http.Server, error) {
 
 	checkHandler := handlers.NewCheckHandler(
 		handlers.NewCheckHandlerConfiguration().
-			WithLogger(options.Logger),
+			WithLogger(options.Logger).
+			WithCheck("grpc reachability", handlers.NewGRPCCheck(options.Config.GRPC.Addr)),
+	)
+
+	readyHandler := handlers.NewCheckHandler(
+		handlers.NewCheckHandlerConfiguration().
+			WithLogger(options.Logger).
+			WithCheck("nats reachability", handlers.NewNatsCheck(options.Config.Events.Cluster)).
+			WithInheritedChecksFrom(checkHandler.Conf),
 	)
 
 	return debug.NewService(
@@ -26,6 +34,6 @@ func Server(opts ...Option) (*http.Server, error) {
 		debug.Pprof(options.Config.Debug.Pprof),
 		debug.Zpages(options.Config.Debug.Zpages),
 		debug.Health(checkHandler),
-		debug.Ready(checkHandler),
+		debug.Ready(readyHandler),
 	), nil
 }
diff --git a/services/notifications/pkg/server/debug/server.go b/services/notifications/pkg/server/debug/server.go
@@ -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"
@@ -17,6 +18,14 @@ func Server(opts ...Option) (*http.Server, error) {
 			WithLogger(options.Logger),
 	)
 
+	readyHandler := handlers.NewCheckHandler(
+		handlers.NewCheckHandlerConfiguration().
+			WithLogger(options.Logger).
+			WithCheck("nats reachability", handlers.NewNatsCheck(options.Config.Notifications.Events.Cluster)).
+			WithCheck("smtp-check", handlers.NewTCPCheck(options.Config.Notifications.SMTP.Host+":"+strconv.Itoa(options.Config.Notifications.SMTP.Port))).
+			WithInheritedChecksFrom(checkHandler.Conf),
+	)
+
 	return debug.NewService(
 		debug.Logger(options.Logger),
 		debug.Name(options.Config.Service.Name),
@@ -26,6 +35,6 @@ func Server(opts ...Option) (*http.Server, error) {
 		debug.Pprof(options.Config.Debug.Pprof),
 		debug.Zpages(options.Config.Debug.Zpages),
 		debug.Health(checkHandler),
-		debug.Ready(checkHandler),
+		debug.Ready(readyHandler),
 	), nil
 }
diff --git a/services/search/pkg/server/debug/server.go b/services/search/pkg/server/debug/server.go
@@ -1,6 +1,7 @@
 package debug
 
 import (
+	"context"
 	"net/http"
 
 	"github.com/owncloud/ocis/v2/ocis-pkg/handlers"
@@ -18,6 +19,19 @@ func Server(opts ...Option) (*http.Server, error) {
 			WithCheck("grpc reachability", handlers.NewGRPCCheck(options.Config.GRPC.Addr)),
 	)
 
+	readyHandler := handlers.NewCheckHandler(
+		handlers.NewCheckHandlerConfiguration().
+			WithLogger(options.Logger).
+			WithCheck("nats reachability", handlers.NewNatsCheck(options.Config.Events.Cluster)).
+			WithCheck("tika-check", func(ctx context.Context) error {
+				if options.Config.Extractor.Type == "tika" {
+					return handlers.NewTCPCheck(options.Config.Extractor.Tika.TikaURL)(ctx)
+				}
+				return nil
+			}).
+			WithInheritedChecksFrom(checkHandler.Conf),
+	)
+
 	return debug.NewService(
 		debug.Logger(options.Logger),
 		debug.Name(options.Config.Service.Name),
@@ -27,6 +41,6 @@ func Server(opts ...Option) (*http.Server, error) {
 		debug.Pprof(options.Config.Debug.Pprof),
 		debug.Zpages(options.Config.Debug.Zpages),
 		debug.Health(checkHandler),
-		debug.Ready(checkHandler),
+		debug.Ready(readyHandler),
 	), nil
 }
diff --git a/services/sse/pkg/server/debug/server.go b/services/sse/pkg/server/debug/server.go
@@ -18,6 +18,13 @@ func Server(opts ...Option) (*http.Server, error) {
 			WithCheck("web reachability", handlers.NewHTTPCheck(options.Config.HTTP.Addr)),
 	)
 
+	readyHandler := handlers.NewCheckHandler(
+		handlers.NewCheckHandlerConfiguration().
+			WithLogger(options.Logger).
+			WithCheck("nats reachability", handlers.NewNatsCheck(options.Config.Events.Cluster)).
+			WithInheritedChecksFrom(checkHandler.Conf),
+	)
+
 	return debug.NewService(
 		debug.Logger(options.Logger),
 		debug.Name(options.Config.Service.Name),
@@ -27,6 +34,6 @@ func Server(opts ...Option) (*http.Server, error) {
 		debug.Pprof(options.Config.Debug.Pprof),
 		debug.Zpages(options.Config.Debug.Zpages),
 		debug.Health(checkHandler),
-		debug.Ready(checkHandler),
+		debug.Ready(readyHandler),
 	), nil
 }
diff --git a/services/userlog/pkg/server/debug/server.go b/services/userlog/pkg/server/debug/server.go
@@ -18,6 +18,13 @@ func Server(opts ...Option) (*http.Server, error) {
 			WithCheck("web reachability", handlers.NewHTTPCheck(options.Config.HTTP.Addr)),
 	)
 
+	readyHandler := handlers.NewCheckHandler(
+		handlers.NewCheckHandlerConfiguration().
+			WithLogger(options.Logger).
+			WithCheck("nats reachability", handlers.NewNatsCheck(options.Config.Events.Cluster)).
+			WithInheritedChecksFrom(checkHandler.Conf),
+	)
+
 	return debug.NewService(
 		debug.Logger(options.Logger),
 		debug.Name(options.Config.Service.Name),
@@ -27,6 +34,6 @@ func Server(opts ...Option) (*http.Server, error) {
 		debug.Pprof(options.Config.Debug.Pprof),
 		debug.Zpages(options.Config.Debug.Zpages),
 		debug.Health(checkHandler),
-		debug.Ready(checkHandler),
+		debug.Ready(readyHandler),
 	), nil
 }