From d6a2f213256aa956add31891e25c9482e16f4d89 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zlatko=20=C4=8Calu=C5=A1i=C4=87?= Date: Sun, 6 Nov 2016 12:11:32 +0100 Subject: [PATCH] Handle errors during server start --- server.go | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/server.go b/server.go index e7ece67..ecef084 100644 --- a/server.go +++ b/server.go @@ -14,6 +14,8 @@ const ( ) func main() { + var err error + // Parse command-line args. var path = flag.String("path", "/tmp/restic", "specifies the path of the data directory") var tls = flag.Bool("tls", false, "turns on tls support") @@ -57,15 +59,19 @@ func main() { // Start the server. if !*tls { - log.Printf("start server on port %s\n", defaultHTTPPort) - http.ListenAndServe(defaultHTTPPort, handler) + log.Printf("Starting server on port %s\n", defaultHTTPPort) + err = http.ListenAndServe(defaultHTTPPort, handler) } else { privateKey := filepath.Join(*path, "private_key") publicKey := filepath.Join(*path, "public_key") log.Println("TLS enabled") - log.Printf("private key: %s", privateKey) - log.Printf("public key: %s", publicKey) - log.Printf("start server on port %s\n", defaultHTTPSPort) - http.ListenAndServeTLS(defaultHTTPSPort, publicKey, privateKey, handler) + log.Printf("Private key: %s", privateKey) + log.Printf("Public key: %s", publicKey) + log.Printf("Starting server on port %s\n", defaultHTTPSPort) + err = http.ListenAndServeTLS(defaultHTTPSPort, publicKey, privateKey, handler) + } + + if err != nil { + log.Fatal(err) } }