From 8005b7ab73c264ee3c1d7b10c39bc5565ef57c02 Mon Sep 17 00:00:00 2001 From: Matthew Holt Date: Fri, 13 Dec 2019 15:36:00 -0700 Subject: Couple of quick fixes --- caddyconfig/httpcaddyfile/httptype.go | 2 +- logging.go | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/caddyconfig/httpcaddyfile/httptype.go b/caddyconfig/httpcaddyfile/httptype.go index 2db3e7c..2b2855d 100644 --- a/caddyconfig/httpcaddyfile/httptype.go +++ b/caddyconfig/httpcaddyfile/httptype.go @@ -203,7 +203,7 @@ func (st ServerType) Setup(originalServerBlocks []caddyfile.ServerBlock, if clVals, ok := sblock.pile["tls.certificate_loader"]; ok { for _, clVal := range clVals { loader := clVal.Value.(caddytls.CertificateLoader) - loaderName := caddy.GetModuleID(loader) + loaderName := caddy.GetModuleName(loader) tlsApp.CertificatesRaw[loaderName] = caddyconfig.JSON(loader, &warnings) } } diff --git a/logging.go b/logging.go index 0b7d9e4..a4a1473 100644 --- a/logging.go +++ b/logging.go @@ -342,6 +342,7 @@ func (cl *CustomLog) provision(ctx Context, logging *Logging) error { if err != nil { return fmt.Errorf("invalid log level: %v", err) } + level = strings.ToLower(level) // set up the log level switch level { -- cgit v1.2.3