From aef560c7fc52092a412d9e97112b8cb879c5eda5 Mon Sep 17 00:00:00 2001
From: Matthew Holt <mholt@users.noreply.github.com>
Date: Tue, 12 May 2020 11:36:20 -0600
Subject: all: Recover from panics in goroutines

---
 modules/caddytls/tls.go | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'modules/caddytls/tls.go')

diff --git a/modules/caddytls/tls.go b/modules/caddytls/tls.go
index 0e92f05..7f2d23e 100644
--- a/modules/caddytls/tls.go
+++ b/modules/caddytls/tls.go
@@ -19,9 +19,11 @@ import (
 	"encoding/json"
 	"fmt"
 	"io/ioutil"
+	"log"
 	"net/http"
 	"os"
 	"path/filepath"
+	"runtime/debug"
 	"strings"
 	"sync"
 	"time"
@@ -367,6 +369,11 @@ func (t *TLS) keepStorageClean() {
 	t.storageCleanTicker = time.NewTicker(storageCleanInterval)
 	t.storageCleanStop = make(chan struct{})
 	go func() {
+		defer func() {
+			if err := recover(); err != nil {
+				log.Printf("[PANIC] storage cleaner: %v\n%s", err, debug.Stack())
+			}
+		}()
 		for {
 			select {
 			case <-t.storageCleanStop:
-- 
cgit v1.2.3