github-mirror/caddy
2
0
Fork 0
mirror of https://github.com/caddyserver/caddy.git synced 2025-05-22 17:49:59 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

metrics: Fix hidden panic while observing with bad exemplars (#3733)

Browse Source 
* metrics: Fixing panic while observing with bad exemplars

Signed-off-by: Dave Henderson <dhenderson@gmail.com>

* Minor cleanup

The server is already added to the context. So, we can simply use that
to get the server name, which is a field on the server.

* Add integration test for auto HTTP->HTTPS redirects

A test like this would have caught the problem in the first place

Co-authored-by: Matthew Holt <mholt@users.noreply.github.com>
This commit is contained in:
Dave Henderson
2020-09-17 23:46:24 -04:00
committed by GitHub
parent c82c231ba7
commit d16ede358a
6 changed files with 62 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
modules/caddyhttp/app.go
View File

@ -155,6 +155,7 @@ func (app *App) Provision(ctx caddy.Context) error {
// prepare each server
for srvName, srv := range app.Servers {
srv.name = srvName
srv.tlsApp = app.tlsApp
srv.logger = app.logger.Named("log")
srv.errorLogger = app.logger.Named("log.error")