Infrastructure/caddy
1
Fork 0
mirror of https://github.com/caddyserver/caddy.git synced 2024-12-16 21:56:40 -05:00
Code Issues Activity

Couple of quick fixes

Browse source
This commit is contained in:
Matthew Holt 2019-12-13 15:36:00 -07:00
parent b1a456cfe3
commit 8005b7ab73
No known key found for this signature in database
GPG key ID: 2A349DD577D586A5
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
caddyconfig/httpcaddyfile/httptype.go
View file

@ -203,7 +203,7 @@ func (st ServerType) Setup(originalServerBlocks []caddyfile.ServerBlock,
if clVals, ok := sblock.pile["tls.certificate_loader"]; ok { if clVals, ok := sblock.pile["tls.certificate_loader"]; ok {
for _, clVal := range clVals { for _, clVal := range clVals {
loader := clVal.Value.(caddytls.CertificateLoader) loader := clVal.Value.(caddytls.CertificateLoader)
loaderName := caddy.GetModuleID(loader) loaderName := caddy.GetModuleName(loader)
tlsApp.CertificatesRaw[loaderName] = caddyconfig.JSON(loader, &warnings) tlsApp.CertificatesRaw[loaderName] = caddyconfig.JSON(loader, &warnings)
} }
} }

1
logging.go
View file

@ -342,6 +342,7 @@ func (cl *CustomLog) provision(ctx Context, logging *Logging) error {
if err != nil { if err != nil {
return fmt.Errorf("invalid log level: %v", err) return fmt.Errorf("invalid log level: %v", err)
} }
level = strings.ToLower(level)
// set up the log level // set up the log level
switch level { switch level {