diff options
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/hook.go | 6 | ||||
| -rw-r--r-- | cmd/migrate.go | 2 | ||||
| -rw-r--r-- | cmd/serv.go | 2 | ||||
| -rw-r--r-- | cmd/web.go | 14 | ||||
| -rw-r--r-- | cmd/web_graceful.go | 2 |
5 files changed, 13 insertions, 13 deletions
diff --git a/cmd/hook.go b/cmd/hook.go index 18d26f17ca..88e61c61d1 100644 --- a/cmd/hook.go +++ b/cmd/hook.go @@ -204,14 +204,14 @@ func runHookPostReceive(c *cli.Context) error { RepoUserName: repoUser, RepoName: repoName, }); err != nil { - log.GitLogger.Error(2, "Update: %v", err) + log.GitLogger.Error("Update: %v", err) } if newCommitID != git.EmptySHA && strings.HasPrefix(refFullName, git.BranchPrefix) { branch := strings.TrimPrefix(refFullName, git.BranchPrefix) repo, pullRequestAllowed, err := private.GetRepository(repoID) if err != nil { - log.GitLogger.Error(2, "get repo: %v", err) + log.GitLogger.Error("get repo: %v", err) break } if !pullRequestAllowed { @@ -229,7 +229,7 @@ func runHookPostReceive(c *cli.Context) error { pr, err := private.ActivePullRequest(baseRepo.ID, repo.ID, baseRepo.DefaultBranch, branch) if err != nil { - log.GitLogger.Error(2, "get active pr: %v", err) + log.GitLogger.Error("get active pr: %v", err) break } diff --git a/cmd/migrate.go b/cmd/migrate.go index d5dd3068cf..3e6bf907a4 100644 --- a/cmd/migrate.go +++ b/cmd/migrate.go @@ -44,7 +44,7 @@ func runMigrate(ctx *cli.Context) error { models.LoadConfigs() if err := models.NewEngine(migrations.Migrate); err != nil { - log.Fatal(4, "Failed to initialize ORM engine: %v", err) + log.Fatal("Failed to initialize ORM engine: %v", err) return err } diff --git a/cmd/serv.go b/cmd/serv.go index cab72f911b..ebd71ad3c7 100644 --- a/cmd/serv.go +++ b/cmd/serv.go @@ -100,7 +100,7 @@ func fail(userMessage, logMessage string, args ...interface{}) { if !setting.ProdMode { fmt.Fprintf(os.Stderr, logMessage+"\n", args...) } - log.GitLogger.Fatal(3, logMessage, args...) + log.GitLogger.Fatal(logMessage, args...) return } 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 diff --git a/cmd/web_graceful.go b/cmd/web_graceful.go index e54561f163..53f407ce9e 100644 --- a/cmd/web_graceful.go +++ b/cmd/web_graceful.go @@ -34,7 +34,7 @@ func runHTTPS(listenAddr, certFile, keyFile string, m http.Handler) error { var err error config.Certificates[0], err = tls.LoadX509KeyPair(certFile, keyFile) if err != nil { - log.Fatal(4, "Failed to load https cert file %s: %v", listenAddr, err) + log.Fatal("Failed to load https cert file %s: %v", listenAddr, err) } return gracehttp.Serve(&http.Server{ |