source/caddy
1
0
Fork 0
mirror of https://github.com/caddyserver/caddy.git synced 2026-02-09 01:59:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

context: AppIfConfigured returns error; consider not-yet-provisioned modules (#6292)

Browse Source 
* context: Add new `AppStrict()` method to avoid instantiating empty apps

* Rename AppStrict -> AppIfConfigured

---------

Co-authored-by: Matthew Holt <mholt@users.noreply.github.com>
This commit is contained in:
Francis Lavoie
2024-05-20 13:14:58 -04:00
committed by GitHub
parent 73e094e1dd
commit a6a45ff6c5
4 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
modules/caddypki/adminapi.go
View File

@@ -50,8 +50,11 @@ 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)
// Avoid initializing PKI if it wasn't configured
if pkiApp := a.ctx.AppIfConfigured("pki"); pkiApp != nil {
// Avoid initializing PKI if it wasn't configured.
// We intentionally ignore the error since it's not
// fatal if the PKI app is not explicitly configured.
pkiApp, err := ctx.AppIfConfigured("pki")
if err == nil {
a.pkiApp = pkiApp.(*PKI)
}