From a8fdc0a9987817173cc24016af1afb1ef09c0776 Mon Sep 17 00:00:00 2001 From: Matthew Holt Date: Tue, 23 Feb 2021 12:57:10 -0700 Subject: core: Initialize logging before admin We'll see how this goes. https://caddy.community/t/calling-the-admin-api-from-within-a-route-route-causes-a-deadlock/11319 --- caddy.go | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/caddy.go b/caddy.go index 70135ff..a56529c 100644 --- a/caddy.go +++ b/caddy.go @@ -325,21 +325,10 @@ func run(newCfg *Config, start bool) error { // been set by a short assignment var err error - // start the admin endpoint (and stop any prior one) - if start { - err = replaceLocalAdminServer(newCfg) - if err != nil { - return fmt.Errorf("starting caddy administration endpoint: %v", err) - } - } - if newCfg == nil { newCfg = new(Config) } - // prepare the new config for use - newCfg.apps = make(map[string]App) - // create a context within which to load // modules - essentially our new config's // execution environment; be sure that @@ -373,6 +362,17 @@ func run(newCfg *Config, start bool) error { return err } + // start the admin endpoint (and stop any prior one) + if start { + err = replaceLocalAdminServer(newCfg) + if err != nil { + return fmt.Errorf("starting caddy administration endpoint: %v", err) + } + } + + // prepare the new config for use + newCfg.apps = make(map[string]App) + // set up global storage and make it CertMagic's default storage, too err = func() error { if newCfg.StorageRaw != nil { -- cgit v1.2.3