trustchain-oc1-orchestral
/
authentik
Archived
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

internal: start embedded outpost directly after backend is healthy instead of waiting 

Signed-off-by: Jens Langhammer <jens.langhammer@beryju.org>
This commit is contained in:
Jens Langhammer 2021-11-04 13:16:53 +01:00
parent 3b47cb64da
commit 6deddd038f
4 changed files with 28 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
authentik/lib/default.yml
View File

@ -68,6 +68,7 @@ outposts:
cookie_domain: null cookie_domain: null
disable_update_check: false disable_update_check: false
disable_startup_analytics: false
avatars: env://AUTHENTIK_AUTHENTIK__AVATARS?gravatar avatars: env://AUTHENTIK_AUTHENTIK__AVATARS?gravatar
geoip: "./GeoLite2-City.mmdb" geoip: "./GeoLite2-City.mmdb"

5
authentik/root/settings.py
View File

@ -437,7 +437,8 @@ if _ERROR_REPORTING:
"Error reporting is enabled", "Error reporting is enabled",
env=CONFIG.y("error_reporting.environment", "customer"), env=CONFIG.y("error_reporting.environment", "customer"),
) )
get_http_session().post( if not CONFIG.y_bool("disable_startup_analytics", False):
get_http_session().post(
"https://goauthentik.io/api/event", "https://goauthentik.io/api/event",
json={ json={
"domain": "authentik", "domain": "authentik",
@ -449,7 +450,7 @@ get_http_session().post(
"User-Agent": sha512(SECRET_KEY.encode("ascii")).hexdigest()[:16], "User-Agent": sha512(SECRET_KEY.encode("ascii")).hexdigest()[:16],
"Content-Type": "text/plain", "Content-Type": "text/plain",
}, },
) )
# Static files (CSS, JavaScript, Images) # Static files (CSS, JavaScript, Images)
# https://docs.djangoproject.com/en/2.1/howto/static-files/ # https://docs.djangoproject.com/en/2.1/howto/static-files/

10
cmd/server/main.go
View File

@ -56,15 +56,17 @@ func main() {
g := gounicorn.NewGoUnicorn() g := gounicorn.NewGoUnicorn()
ws := web.NewWebServer(g) ws := web.NewWebServer(g)
g.HealthyCallback = func() {
if !config.G.Web.DisableEmbeddedOutpost {
go attemptProxyStart(ws, u)
}
}
defer g.Kill() defer g.Kill()
defer ws.Shutdown() defer ws.Shutdown()
go web.RunMetricsServer() go web.RunMetricsServer()
for { for {
go attemptStartBackend(g) go attemptStartBackend(g)
ws.Start() ws.Start()
if !config.G.Web.DisableEmbeddedOutpost {
go attemptProxyStart(ws, u)
}
<-ex <-ex
running = false running = false
@ -88,8 +90,6 @@ func attemptStartBackend(g *gounicorn.GoUnicorn) {
func attemptProxyStart(ws *web.WebServer, u *url.URL) { func attemptProxyStart(ws *web.WebServer, u *url.URL) {
maxTries := 100 maxTries := 100
attempt := 0 attempt := 0
// Sleep to wait for the app server to start
time.Sleep(30 * time.Second)
for { for {
log.WithField("logger", "authentik").Debug("attempting to init outpost") log.WithField("logger", "authentik").Debug("attempting to init outpost")
ac := ak.NewAPIController(*u, config.G.SecretKey) ac := ak.NewAPIController(*u, config.G.SecretKey)

4
internal/gounicorn/gounicorn.go
View File

@ -11,6 +11,8 @@ import (
) )
type GoUnicorn struct { type GoUnicorn struct {
HealthyCallback func()
log *log.Entry log *log.Entry
p *exec.Cmd p *exec.Cmd
started bool started bool
@ -25,6 +27,7 @@ func NewGoUnicorn() *GoUnicorn {
started: false, started: false,
killed: false, killed: false,
alive: false, alive: false,
HealthyCallback: func() {},
} }
g.initCmd() g.initCmd()
return g return g
@ -76,6 +79,7 @@ func (g *GoUnicorn) healthcheck() {
for range time.Tick(time.Second) { for range time.Tick(time.Second) {
if check() { if check() {
g.log.Info("backend is alive, backing off with healthchecks") g.log.Info("backend is alive, backing off with healthchecks")
g.HealthyCallback()
break break
} }
g.log.Debug("backend not alive yet") g.log.Debug("backend not alive yet")