diff options
Diffstat (limited to 'cmd/web.go')
| -rw-r--r-- | cmd/web.go | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/cmd/web.go b/cmd/web.go index 8fed559ff5..4641645ee4 100644 --- a/cmd/web.go +++ b/cmd/web.go @@ -69,7 +69,7 @@ func runHTTPRedirector() { var err = runHTTP(source, context2.ClearHandler(handler)) if err != nil { - log.Fatal(4, "Failed to start port redirection: %v", err) + log.Fatal("Failed to start port redirection: %v", err) } } @@ -84,7 +84,7 @@ func runLetsEncrypt(listenAddr, domain, directory, email string, m http.Handler) log.Info("Running Let's Encrypt handler on %s", setting.HTTPAddr+":"+setting.PortToRedirect) var err = http.ListenAndServe(setting.HTTPAddr+":"+setting.PortToRedirect, certManager.HTTPHandler(http.HandlerFunc(runLetsEncryptFallbackHandler))) // all traffic coming into HTTP will be redirect to HTTPS automatically (LE HTTP-01 validation happens here) if err != nil { - log.Fatal(4, "Failed to start the Let's Encrypt handler on port %s: %v", setting.PortToRedirect, err) + log.Fatal("Failed to start the Let's Encrypt handler on port %s: %v", setting.PortToRedirect, err) } }() server := &http.Server{ @@ -192,13 +192,13 @@ func runWeb(ctx *cli.Context) error { case setting.FCGI: listener, err := net.Listen("tcp", listenAddr) if err != nil { - log.Fatal(4, "Failed to bind %s", listenAddr, err) + log.Fatal("Failed to bind %s: %v", listenAddr, err) } defer listener.Close() err = fcgi.Serve(listener, context2.ClearHandler(m)) case setting.UnixSocket: if err := os.Remove(listenAddr); err != nil && !os.IsNotExist(err) { - log.Fatal(4, "Failed to remove unix socket directory %s: %v", listenAddr, err) + log.Fatal("Failed to remove unix socket directory %s: %v", listenAddr, err) } var listener *net.UnixListener listener, err = net.ListenUnix("unix", &net.UnixAddr{Name: listenAddr, Net: "unix"}) @@ -209,15 +209,15 @@ func runWeb(ctx *cli.Context) error { // FIXME: add proper implementation of signal capture on all protocols // execute this on SIGTERM or SIGINT: listener.Close() if err = os.Chmod(listenAddr, os.FileMode(setting.UnixSocketPermission)); err != nil { - log.Fatal(4, "Failed to set permission of unix socket: %v", err) + log.Fatal("Failed to set permission of unix socket: %v", err) } err = http.Serve(listener, context2.ClearHandler(m)) default: - log.Fatal(4, "Invalid protocol: %s", setting.Protocol) + log.Fatal("Invalid protocol: %s", setting.Protocol) } if err != nil { - log.Fatal(4, "Failed to start server: %v", err) + log.Fatal("Failed to start server: %v", err) } return nil |