diff options
author | zeripath <art27@cantab.net> | 2019-04-02 08:48:31 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-04-02 08:48:31 +0100 |
commit | 704da08fdc6bae6fdd6bf1b892ebe12afeef5eca (patch) | |
tree | e0613ab3ba0d4336b0912bbad8862f503ec180f6 /routers/repo | |
parent | ef2a343e27d8af2de0bb696bd60d9a019e1e8b69 (diff) | |
download | gitea-704da08fdc6bae6fdd6bf1b892ebe12afeef5eca.tar.gz gitea-704da08fdc6bae6fdd6bf1b892ebe12afeef5eca.zip |
Better logging (#6038) (#6095)
* Panic don't fatal on create new logger
Fixes #5854
Signed-off-by: Andrew Thornton <art27@cantab.net>
* partial broken
* Update the logging infrastrcture
Signed-off-by: Andrew Thornton <art27@cantab.net>
* Reset the skip levels for Fatal and Error
Signed-off-by: Andrew Thornton <art27@cantab.net>
* broken ncsa
* More log.Error fixes
Signed-off-by: Andrew Thornton <art27@cantab.net>
* Remove nal
* set log-levels to lowercase
* Make console_test test all levels
* switch to lowercased levels
* OK now working
* Fix vetting issues
* Fix lint
* Fix tests
* change default logging to match current gitea
* Improve log testing
Signed-off-by: Andrew Thornton <art27@cantab.net>
* reset error skip levels to 0
* Update documentation and access logger configuration
* Redirect the router log back to gitea if redirect macaron log but also allow setting the log level - i.e. TRACE
* Fix broken level caching
* Refactor the router log
* Add Router logger
* Add colorizing options
* Adjust router colors
* Only create logger if they will be used
* update app.ini.sample
* rename Attribute ColorAttribute
* Change from white to green for function
* Set fatal/error levels
* Restore initial trace logger
* Fix Trace arguments in modules/auth/auth.go
* Properly handle XORMLogger
* Improve admin/config page
* fix fmt
* Add auto-compression of old logs
* Update error log levels
* Remove the unnecessary skip argument from Error, Fatal and Critical
* Add stacktrace support
* Fix tests
* Remove x/sync from vendors?
* Add stderr option to console logger
* Use filepath.ToSlash to protect against Windows in tests
* Remove prefixed underscores from names in colors.go
* Remove not implemented database logger
This was removed from Gogs on 4 Mar 2016 but left in the configuration
since then.
* Ensure that log paths are relative to ROOT_PATH
* use path.Join
* rename jsonConfig to logConfig
* Rename "config" to "jsonConfig" to make it clearer
* Requested changes
* Requested changes: XormLogger
* Try to color the windows terminal
If successful default to colorizing the console logs
* fixup
* Colorize initially too
* update vendor
* Colorize logs on default and remove if this is not a colorizing logger
* Fix documentation
* fix test
* Use go-isatty to detect if on windows we are on msys or cygwin
* Fix spelling mistake
* Add missing vendors
* More changes
* Rationalise the ANSI writer protection
* Adjust colors on advice from @0x5c
* Make Flags a comma separated list
* Move to use the windows constant for ENABLE_VIRTUAL_TERMINAL_PROCESSING
* Ensure matching is done on the non-colored message - to simpify EXPRESSION
Diffstat (limited to 'routers/repo')
-rw-r--r-- | routers/repo/branch.go | 14 | ||||
-rw-r--r-- | routers/repo/commit.go | 2 | ||||
-rw-r--r-- | routers/repo/editor.go | 4 | ||||
-rw-r--r-- | routers/repo/http.go | 10 | ||||
-rw-r--r-- | routers/repo/issue.go | 8 | ||||
-rw-r--r-- | routers/repo/pull.go | 10 | ||||
-rw-r--r-- | routers/repo/repo.go | 4 | ||||
-rw-r--r-- | routers/repo/setting.go | 8 | ||||
-rw-r--r-- | routers/repo/topic.go | 2 | ||||
-rw-r--r-- | routers/repo/view.go | 4 |
10 files changed, 33 insertions, 33 deletions
diff --git a/routers/repo/branch.go b/routers/repo/branch.go index 19925c1edc..a29519a43f 100644 --- a/routers/repo/branch.go +++ b/routers/repo/branch.go @@ -51,7 +51,7 @@ func DeleteBranchPost(ctx *context.Context) { branchName := ctx.Query("name") isProtected, err := ctx.Repo.Repository.IsProtectedBranch(branchName, ctx.User) if err != nil { - log.Error(4, "DeleteBranch: %v", err) + log.Error("DeleteBranch: %v", err) ctx.Flash.Error(ctx.Tr("repo.branch.deletion_failed", branchName)) return } @@ -83,7 +83,7 @@ func RestoreBranchPost(ctx *context.Context) { deletedBranch, err := ctx.Repo.Repository.GetDeletedBranchByID(branchID) if err != nil { - log.Error(4, "GetDeletedBranchByID: %v", err) + log.Error("GetDeletedBranchByID: %v", err) ctx.Flash.Error(ctx.Tr("repo.branch.restore_failed", branchName)) return } @@ -93,13 +93,13 @@ func RestoreBranchPost(ctx *context.Context) { ctx.Flash.Error(ctx.Tr("repo.branch.already_exists", deletedBranch.Name)) return } - log.Error(4, "CreateBranch: %v", err) + log.Error("CreateBranch: %v", err) ctx.Flash.Error(ctx.Tr("repo.branch.restore_failed", deletedBranch.Name)) return } if err := ctx.Repo.Repository.RemoveDeletedBranch(deletedBranch.ID); err != nil { - log.Error(4, "RemoveDeletedBranch: %v", err) + log.Error("RemoveDeletedBranch: %v", err) ctx.Flash.Error(ctx.Tr("repo.branch.restore_failed", deletedBranch.Name)) return } @@ -116,14 +116,14 @@ func redirect(ctx *context.Context) { func deleteBranch(ctx *context.Context, branchName string) error { commit, err := ctx.Repo.GitRepo.GetBranchCommit(branchName) if err != nil { - log.Error(4, "GetBranchCommit: %v", err) + log.Error("GetBranchCommit: %v", err) return err } if err := ctx.Repo.GitRepo.DeleteBranch(branchName, git.DeleteBranchOptions{ Force: true, }); err != nil { - log.Error(4, "DeleteBranch: %v", err) + log.Error("DeleteBranch: %v", err) return err } @@ -137,7 +137,7 @@ func deleteBranch(ctx *context.Context, branchName string) error { RepoUserName: ctx.Repo.Owner.Name, RepoName: ctx.Repo.Repository.Name, }); err != nil { - log.Error(4, "Update: %v", err) + log.Error("Update: %v", err) } if err := ctx.Repo.Repository.AddDeletedBranch(branchName, commit.ID.String(), ctx.User.ID); err != nil { diff --git a/routers/repo/commit.go b/routers/repo/commit.go index 9e40ced7fb..6b99a1220d 100644 --- a/routers/repo/commit.go +++ b/routers/repo/commit.go @@ -203,7 +203,7 @@ func Diff(ctx *context.Context) { statuses, err := models.GetLatestCommitStatus(ctx.Repo.Repository, commitID, 0) if err != nil { - log.Error(3, "GetLatestCommitStatus: %v", err) + log.Error("GetLatestCommitStatus: %v", err) } ctx.Data["CommitStatus"] = models.CalcCommitStatus(statuses) diff --git a/routers/repo/editor.go b/routers/repo/editor.go index 54046258b8..6c47f51f9b 100644 --- a/routers/repo/editor.go +++ b/routers/repo/editor.go @@ -35,7 +35,7 @@ const ( func renderCommitRights(ctx *context.Context) bool { canCommit, err := ctx.Repo.CanCommitToBranch(ctx.User) if err != nil { - log.Error(4, "CanCommitToBranch: %v", err) + log.Error("CanCommitToBranch: %v", err) } ctx.Data["CanCommitToBranch"] = canCommit return canCommit @@ -117,7 +117,7 @@ func editFile(ctx *context.Context, isNewFile bool) { buf = append(buf, d...) if content, err := templates.ToUTF8WithErr(buf); err != nil { if err != nil { - log.Error(4, "ToUTF8WithErr: %v", err) + log.Error("ToUTF8WithErr: %v", err) } ctx.Data["FileContent"] = string(buf) } else { diff --git a/routers/repo/http.go b/routers/repo/http.go index 0e04380330..9475c25893 100644 --- a/routers/repo/http.go +++ b/routers/repo/http.go @@ -181,7 +181,7 @@ func HTTP(ctx *context.Context) { } } else { if !models.IsErrAccessTokenNotExist(err) && !models.IsErrAccessTokenEmpty(err) { - log.Error(4, "GetAccessTokenBySha: %v", err) + log.Error("GetAccessTokenBySha: %v", err) } } @@ -324,7 +324,7 @@ func gitCommand(dir string, args ...string) []byte { cmd.Dir = dir out, err := cmd.Output() if err != nil { - log.GitLogger.Error(4, fmt.Sprintf("%v - %s", err, out)) + log.GitLogger.Error(fmt.Sprintf("%v - %s", err, out)) } return out } @@ -382,7 +382,7 @@ func serviceRPC(h serviceHandler, service string) { if h.r.Header.Get("Content-Encoding") == "gzip" { reqBody, err = gzip.NewReader(reqBody) if err != nil { - log.GitLogger.Error(2, "fail to create gzip reader: %v", err) + log.GitLogger.Error("Fail to create gzip reader: %v", err) h.w.WriteHeader(http.StatusInternalServerError) return } @@ -401,7 +401,7 @@ func serviceRPC(h serviceHandler, service string) { cmd.Stdin = reqBody cmd.Stderr = &stderr if err := cmd.Run(); err != nil { - log.GitLogger.Error(2, "fail to serve RPC(%s): %v - %v", service, err, stderr) + log.GitLogger.Error("Fail to serve RPC(%s): %v - %v", service, err, stderr) return } } @@ -514,7 +514,7 @@ func HTTPBackend(ctx *context.Context, cfg *serviceConfig) http.HandlerFunc { file := strings.Replace(r.URL.Path, m[1]+"/", "", 1) dir, err := getGitRepoPath(m[1]) if err != nil { - log.GitLogger.Error(4, err.Error()) + log.GitLogger.Error(err.Error()) ctx.NotFound("HTTPBackend", err) return } diff --git a/routers/repo/issue.go b/routers/repo/issue.go index 2db2cfc71b..45033e67c2 100644 --- a/routers/repo/issue.go +++ b/routers/repo/issue.go @@ -408,7 +408,7 @@ func NewIssue(ctx *context.Context) { milestoneID := ctx.QueryInt64("milestone") milestone, err := models.GetMilestoneByID(milestoneID) if err != nil { - log.Error(4, "GetMilestoneByID: %d: %v", milestoneID, err) + log.Error("GetMilestoneByID: %d: %v", milestoneID, err) } else { ctx.Data["milestone_id"] = milestoneID ctx.Data["Milestone"] = milestone @@ -847,7 +847,7 @@ func ViewIssue(ctx *context.Context) { if ctx.IsSigned { if err := pull.GetHeadRepo(); err != nil { - log.Error(4, "GetHeadRepo: %v", err) + log.Error("GetHeadRepo: %v", err) } else if pull.HeadRepo != nil && pull.HeadBranch != pull.HeadRepo.DefaultBranch { perm, err := models.GetUserRepoPermission(pull.HeadRepo, ctx.User) if err != nil { @@ -857,7 +857,7 @@ func ViewIssue(ctx *context.Context) { if perm.CanWrite(models.UnitTypeCode) { // Check if branch is not protected if protected, err := pull.HeadRepo.IsProtectedBranch(pull.HeadBranch, ctx.User); err != nil { - log.Error(4, "IsProtectedBranch: %v", err) + log.Error("IsProtectedBranch: %v", err) } else if !protected { canDelete = true ctx.Data["DeleteBranchLink"] = ctx.Repo.RepoLink + "/pulls/" + com.ToStr(issue.Index) + "/cleanup" @@ -1204,7 +1204,7 @@ func NewComment(ctx *context.Context, form auth.CreateCommentForm) { } else { isClosed := form.Status == "close" if err := issue.ChangeStatus(ctx.User, isClosed); err != nil { - log.Error(4, "ChangeStatus: %v", err) + log.Error("ChangeStatus: %v", err) if models.IsErrDependenciesLeft(err) { if issue.IsPull { diff --git a/routers/repo/pull.go b/routers/repo/pull.go index 08c833c167..14ab2207b5 100644 --- a/routers/repo/pull.go +++ b/routers/repo/pull.go @@ -1058,7 +1058,7 @@ func CleanUpPullRequest(ctx *context.Context) { // Check if branch is not protected if protected, err := pr.HeadRepo.IsProtectedBranch(pr.HeadBranch, ctx.User); err != nil || protected { if err != nil { - log.Error(4, "HeadRepo.IsProtectedBranch: %v", err) + log.Error("HeadRepo.IsProtectedBranch: %v", err) } ctx.Flash.Error(ctx.Tr("repo.branch.deletion_failed", fullBranchName)) return @@ -1067,13 +1067,13 @@ func CleanUpPullRequest(ctx *context.Context) { // Check if branch has no new commits headCommitID, err := gitBaseRepo.GetRefCommitID(pr.GetGitRefName()) if err != nil { - log.Error(4, "GetRefCommitID: %v", err) + log.Error("GetRefCommitID: %v", err) ctx.Flash.Error(ctx.Tr("repo.branch.deletion_failed", fullBranchName)) return } branchCommitID, err := gitRepo.GetBranchCommitID(pr.HeadBranch) if err != nil { - log.Error(4, "GetBranchCommitID: %v", err) + log.Error("GetBranchCommitID: %v", err) ctx.Flash.Error(ctx.Tr("repo.branch.deletion_failed", fullBranchName)) return } @@ -1085,14 +1085,14 @@ func CleanUpPullRequest(ctx *context.Context) { if err := gitRepo.DeleteBranch(pr.HeadBranch, git.DeleteBranchOptions{ Force: true, }); err != nil { - log.Error(4, "DeleteBranch: %v", err) + log.Error("DeleteBranch: %v", err) ctx.Flash.Error(ctx.Tr("repo.branch.deletion_failed", fullBranchName)) return } if err := models.AddDeletePRBranchComment(ctx.User, pr.BaseRepo, issue.ID, pr.HeadBranch); err != nil { // Do not fail here as branch has already been deleted - log.Error(4, "DeleteBranch: %v", err) + log.Error("DeleteBranch: %v", err) } ctx.Flash.Success(ctx.Tr("repo.branch.deletion_success", fullBranchName)) diff --git a/routers/repo/repo.go b/routers/repo/repo.go index 5add788fc8..5588b07e2a 100644 --- a/routers/repo/repo.go +++ b/routers/repo/repo.go @@ -182,7 +182,7 @@ func CreatePost(ctx *context.Context, form auth.CreateRepoForm) { if repo != nil { if errDelete := models.DeleteRepository(ctx.User, ctxUser.ID, repo.ID); errDelete != nil { - log.Error(4, "DeleteRepository: %v", errDelete) + log.Error("DeleteRepository: %v", errDelete) } } @@ -265,7 +265,7 @@ func MigratePost(ctx *context.Context, form auth.MigrateRepoForm) { if repo != nil { if errDelete := models.DeleteRepository(ctx.User, ctxUser.ID, repo.ID); errDelete != nil { - log.Error(4, "DeleteRepository: %v", errDelete) + log.Error("DeleteRepository: %v", errDelete) } } diff --git a/routers/repo/setting.go b/routers/repo/setting.go index 2520b57bc7..c24cee3b21 100644 --- a/routers/repo/setting.go +++ b/routers/repo/setting.go @@ -110,7 +110,7 @@ func SettingsPost(ctx *context.Context, form auth.RepoSettingForm) { if isNameChanged { if err := models.RenameRepoAction(ctx.User, oldRepoName, repo); err != nil { - log.Error(4, "RenameRepoAction: %v", err) + log.Error("RenameRepoAction: %v", err) } } @@ -398,7 +398,7 @@ func SettingsPost(ctx *context.Context, form auth.RepoSettingForm) { } if err := repo.SetArchiveRepoState(true); err != nil { - log.Error(4, "Tried to archive a repo: %s", err) + log.Error("Tried to archive a repo: %s", err) ctx.Flash.Error(ctx.Tr("repo.settings.archive.error")) ctx.Redirect(ctx.Repo.RepoLink + "/settings") return @@ -415,7 +415,7 @@ func SettingsPost(ctx *context.Context, form auth.RepoSettingForm) { } if err := repo.SetArchiveRepoState(false); err != nil { - log.Error(4, "Tried to unarchive a repo: %s", err) + log.Error("Tried to unarchive a repo: %s", err) ctx.Flash.Error(ctx.Tr("repo.settings.unarchive.error")) ctx.Redirect(ctx.Repo.RepoLink + "/settings") return @@ -502,7 +502,7 @@ func ChangeCollaborationAccessMode(ctx *context.Context) { if err := ctx.Repo.Repository.ChangeCollaborationAccessMode( ctx.QueryInt64("uid"), models.AccessMode(ctx.QueryInt("mode"))); err != nil { - log.Error(4, "ChangeCollaborationAccessMode: %v", err) + log.Error("ChangeCollaborationAccessMode: %v", err) } } diff --git a/routers/repo/topic.go b/routers/repo/topic.go index 63fcf793f9..4a1194bc2d 100644 --- a/routers/repo/topic.go +++ b/routers/repo/topic.go @@ -60,7 +60,7 @@ func TopicsPost(ctx *context.Context) { err := models.SaveTopics(ctx.Repo.Repository.ID, topics...) if err != nil { - log.Error(2, "SaveTopics failed: %v", err) + log.Error("SaveTopics failed: %v", err) ctx.JSON(500, map[string]interface{}{ "message": "Save topics failed.", }) diff --git a/routers/repo/view.go b/routers/repo/view.go index dcd546ff68..e883ebbf89 100644 --- a/routers/repo/view.go +++ b/routers/repo/view.go @@ -192,7 +192,7 @@ func renderDirectory(ctx *context.Context, treeLink string) { statuses, err := models.GetLatestCommitStatus(ctx.Repo.Repository, ctx.Repo.Commit.ID.String(), 0) if err != nil { - log.Error(3, "GetLatestCommitStatus: %v", err) + log.Error("GetLatestCommitStatus: %v", err) } ctx.Data["LatestCommitStatus"] = models.CalcCommitStatus(statuses) @@ -304,7 +304,7 @@ func renderFile(ctx *context.Context, entry *git.TreeEntry, treeLink, rawLink st var fileContent string if content, err := templates.ToUTF8WithErr(buf); err != nil { if err != nil { - log.Error(4, "ToUTF8WithErr: %v", err) + log.Error("ToUTF8WithErr: %v", err) } fileContent = string(buf) } else { |