Stowage/caddy
2
0
Fork 0
mirror of https://github.com/caddyserver/caddy.git synced 2025-10-19 15:53:17 +00:00
Code Issues Projects Releases Packages Wiki Activity

context: Rename func to AppIfConfigured (#5397)

Browse source
This commit is contained in:
Francis Lavoie 2023-02-27 13:58:27 -05:00 • committed by GitHub
parent 941eae5f61
commit f6bab8ba85
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

16
modules/caddypki/adminapi.go
View file

@ -49,20 +49,14 @@ func (a *adminAPI) Provision(ctx caddy.Context) error {
a.ctx = ctx
a.log = ctx.Logger(a) // TODO: passing in 'a' is a hack until the admin API is officially extensible (see #5032)
// First check if the PKI app was configured, because
// a.ctx.App() has the side effect of instantiating
// and provisioning an app even if it wasn't configured.
pkiAppConfigured := a.ctx.AppIsConfigured("pki")
if !pkiAppConfigured {
return nil
}
// Load the PKI app, so we can query it for information.
appModule, err := a.ctx.App("pki")
// Avoid initializing PKI if it wasn't configured
pkiApp, err := a.ctx.AppIfConfigured("pki")
if err != nil {
return err
}
a.pkiApp = appModule.(*PKI)
if pkiApp != nil {
a.pkiApp = pkiApp.(*PKI)
}
return nil
}