aboutsummaryrefslogtreecommitdiffhomepage
path: root/daemon
diff options
context:
space:
mode:
authorGravatar Frédéric Guillot <fred@miniflux.net>2018-09-08 21:20:24 -0700
committerGravatar Frédéric Guillot <fred@miniflux.net>2018-09-08 21:20:24 -0700
commit2306a4b2f6464b0f3cb822405e37471a37abe46f (patch)
treeb62b82587e2a7ba34d9a63ebf94b02c223cf9377 /daemon
parent07cd7d2135b13ea211ce7d950ef903b85f190f85 (diff)
Avoid displaying an error when shutting down the daemon
Diffstat (limited to 'daemon')
-rw-r--r--daemon/server.go12
1 files changed, 9 insertions, 3 deletions
diff --git a/daemon/server.go b/daemon/server.go
index c00027f..084a709 100644
--- a/daemon/server.go
+++ b/daemon/server.go
@@ -50,7 +50,9 @@ func newServer(cfg *config.Config, store *storage.Storage, pool *scheduler.Worke
go func() {
logger.Info(`Listening on "%s" by using auto-configured certificate for "%s"`, server.Addr, certDomain)
- logger.Fatal(server.Serve(certManager.Listener()).Error())
+ if err := server.Serve(certManager.Listener()); err != http.ErrServerClosed {
+ logger.Fatal(`Server failed to start: %v`, err)
+ }
}()
} else if certFile != "" && keyFile != "" {
server.TLSConfig = &tls.Config{MinVersion: tls.VersionTLS12}
@@ -58,12 +60,16 @@ func newServer(cfg *config.Config, store *storage.Storage, pool *scheduler.Worke
go func() {
logger.Info(`Listening on "%s" by using certificate "%s" and key "%s"`, server.Addr, certFile, keyFile)
- logger.Fatal(server.ListenAndServeTLS(certFile, keyFile).Error())
+ if err := server.ListenAndServeTLS(certFile, keyFile); err != http.ErrServerClosed {
+ logger.Fatal(`Server failed to start: %v`, err)
+ }
}()
} else {
go func() {
logger.Info(`Listening on "%s" without TLS`, server.Addr)
- logger.Fatal(server.ListenAndServe().Error())
+ if err := server.ListenAndServe(); err != http.ErrServerClosed {
+ logger.Fatal(`Server failed to start: %v`, err)
+ }
}()
}