caddy: improve error naming (#2526)

f6e6a6be · johncming · Matt Holt · bc5df3b3 · f6e6a6be
Commit f6e6a6be authored Mar 17, 2019 by johncming Committed by Matt Holt Mar 16, 2019
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 3 deletions

caddy.go caddy.go +2 -3

No files found.
--- a/caddy.go
+++ b/caddy.go
@@ -193,9 +193,8 @@ func (i *Instance) Restart(newCaddyfile Input) (*Instance, error) {
 		r := recover()
 		if err != nil || r != nil {
 			for _, fn := range i.OnRestartFailed {
-				err2 := fn()
+				if err := fn(); err != nil {
-				if err2 != nil {
+					log.Printf("[ERROR] Restart failed callback returned error: %v", err)
-					log.Printf("[ERROR] Restart failed callback returned error: %v", err2)
 				}
 			}
 			if err != nil {