Revert "internal: fix high cpu when backend isnt healthy"

This reverts commit eb6cfd22a7.

Revert "root: handle JSON error in metrics too"

This reverts commit 1ede972222.

Revert "root: don't force multiprocess prometheus registry"

This reverts commit cd1d1b4402.

Revert "root: add error handling for prometheus view"

This reverts commit c0a883f76f.

authentik/root/monitoring.py

@@ -1,6 +1,5 @@
 """Metrics view"""
 from base64 import b64encode
-from json import JSONDecodeError
 
 from django.conf import settings
 from django.db import connections
@@ -32,10 +31,7 @@ class MetricsView(View):
 
         monitoring_set.send_robust(self)
 
-        try:
+        return ExportToDjangoView(request)
-            return ExportToDjangoView(request)
-        except (UnicodeDecodeError, KeyError, ValueError, JSONDecodeError):
-            return HttpResponse(status_code=500)
 
 
 class LiveView(View):

internal/gounicorn/gounicorn.go

@@ -83,20 +83,14 @@ func (g *GoUnicorn) healthcheck() {
 
 	// Default healthcheck is every 1 second on startup
 	// once we've been healthy once, increase to 30 seconds
-	func() {
+	for range time.Tick(time.Second) {
-		for {
+		if check() {
-			select {
+			g.log.Info("backend is alive, backing off with healthchecks")
-			case <-time.Tick(1 * time.Second):
+			g.HealthyCallback()
-				if check() {
+			break
-					g.log.Info("backend is alive, backing off with healthchecks")
-					g.HealthyCallback()
-					return
-				} else {
-					g.log.Debug("backend not alive yet")
-				}
-			}
 		}
-	}()
+		g.log.Debug("backend not alive yet")
+	}
 	for range time.Tick(30 * time.Second) {
 		check()
 	}