From 7c989fda08961981be7189f649574b5cebb68762 Mon Sep 17 00:00:00 2001 From: Harvey Tindall Date: Sun, 21 Jul 2024 17:01:52 +0100 Subject: [PATCH] tls: don't "crash" on server close TLS server section called Fatalf, while the normal section called Printf on server close. Fatalf is now only called if the server wasn't shutdown manually, e.g. when certificates are wrong. Same change was applied to non-tls section, so crashes will actually occur when things like ports are occupied. Fixes #343. --- main.go | 12 ++++++++++-- package-lock.json | 1 - 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/main.go b/main.go index 8566c23..55a7834 100644 --- a/main.go +++ b/main.go @@ -566,11 +566,19 @@ func start(asDaemon, firstCall bool) { } } - app.err.Fatalf("Failure serving with SSL/TLS: %s", err) + if err == http.ErrServerClosed { + app.err.Printf("Failure serving with SSL/TLS: %s", err) + } else { + app.err.Fatalf("Failure serving with SSL/TLS: %s", err) + } } } else { if err := SRV.ListenAndServe(); err != nil { - app.err.Printf("Failure serving: %s", err) + if err == http.ErrServerClosed { + app.err.Printf("Failure serving: %s", err) + } else { + app.err.Fatalf("Failure serving: %s", err) + } } } }() diff --git a/package-lock.json b/package-lock.json index 76613cc..4e39d15 100644 --- a/package-lock.json +++ b/package-lock.json @@ -15,7 +15,6 @@ "any-date-parser": "^1.5.4", "browserslist": "^4.21.7", "cheerio": "^1.0.0-rc.12", - "esbuild": "^0.18.20", "fs-cheerio": "^3.0.0", "inline-source": "^8.0.2", "jsdom": "^22.1.0",