Preserve existing behaviour

Signed-off-by: Kemal Akkoyun <[email protected]>

Author: kakkoyun

cmd/thanos/bucket.go

@@ -345,7 +345,16 @@ func registerBucketWeb(m map[string]setupFunc, root *kingpin.CmdClause, name str
 			cancel()
 		})
 
-		g.Add(srv.ListenAndServe, srv.Shutdown)
+		g.Add(func() error {
+			statusProber.Healthy()
+
+			return srv.ListenAndServe()
+		}, func(err error) {
+			statusProber.NotReady(err)
+			defer statusProber.NotHealthy(err)
+
+			srv.Shutdown(err)
+		})
 
 		return nil
 	}

cmd/thanos/compact.go

@@ -184,9 +184,12 @@ func runCompact(
 
 	g.Add(func() error {
 		statusProber.Healthy()
+
 		return srv.ListenAndServe()
 	}, func(err error) {
 		statusProber.NotReady(err)
+		defer statusProber.NotHealthy(err)
+
 		srv.Shutdown(err)
 	})
 

cmd/thanos/downsample.go

@@ -130,9 +130,12 @@ func runDownsample(
 	)
 	g.Add(func() error {
 		statusProber.Healthy()
+
 		return srv.ListenAndServe()
 	}, func(err error) {
 		statusProber.NotReady(err)
+		defer statusProber.NotHealthy(err)
+
 		srv.Shutdown(err)
 	})
 

cmd/thanos/query.go

@@ -390,9 +390,12 @@ func runQuery(
 
 		g.Add(func() error {
 			statusProber.Healthy()
+
 			return srv.ListenAndServe()
 		}, func(err error) {
 			statusProber.NotReady(err)
+			defer statusProber.NotHealthy(err)
+
 			srv.Shutdown(err)
 		})
 	}

cmd/thanos/receive.go

@@ -345,9 +345,12 @@ func runReceive(
 	)
 	g.Add(func() error {
 		statusProber.Healthy()
+
 		return srv.ListenAndServe()
 	}, func(err error) {
 		statusProber.NotReady(err)
+		defer statusProber.NotHealthy(err)
+
 		srv.Shutdown(err)
 	})
 

cmd/thanos/rule.go

@@ -562,9 +562,12 @@ func runRule(
 
 		g.Add(func() error {
 			statusProber.Healthy()
+
 			return srv.ListenAndServe()
 		}, func(err error) {
 			statusProber.NotReady(err)
+			defer statusProber.NotHealthy(err)
+
 			srv.Shutdown(err)
 		})
 	}

cmd/thanos/sidecar.go

@@ -148,9 +148,12 @@ func runSidecar(
 
 	g.Add(func() error {
 		statusProber.Healthy()
+
 		return srv.ListenAndServe()
 	}, func(err error) {
 		statusProber.NotReady(err)
+		defer statusProber.NotHealthy(err)
+
 		srv.Shutdown(err)
 	})
 

cmd/thanos/store.go

@@ -140,9 +140,12 @@ func runStore(
 
 	g.Add(func() error {
 		statusProber.Healthy()
+
 		return srv.ListenAndServe()
 	}, func(err error) {
 		statusProber.NotReady(err)
+		defer statusProber.NotHealthy(err)
+
 		srv.Shutdown(err)
 	})