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 /models/issue_comment.go | |
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 'models/issue_comment.go')
-rw-r--r-- | models/issue_comment.go | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/models/issue_comment.go b/models/issue_comment.go index d4a3d26a78..360f5a6594 100644 --- a/models/issue_comment.go +++ b/models/issue_comment.go @@ -171,12 +171,12 @@ func (c *Comment) AfterDelete() { func (c *Comment) HTMLURL() string { err := c.LoadIssue() if err != nil { // Silently dropping errors :unamused: - log.Error(4, "LoadIssue(%d): %v", c.IssueID, err) + log.Error("LoadIssue(%d): %v", c.IssueID, err) return "" } err = c.Issue.loadRepo(x) if err != nil { // Silently dropping errors :unamused: - log.Error(4, "loadRepo(%d): %v", c.Issue.RepoID, err) + log.Error("loadRepo(%d): %v", c.Issue.RepoID, err) return "" } if c.Type == CommentTypeCode { @@ -200,7 +200,7 @@ func (c *Comment) HTMLURL() string { func (c *Comment) IssueURL() string { err := c.LoadIssue() if err != nil { // Silently dropping errors :unamused: - log.Error(4, "LoadIssue(%d): %v", c.IssueID, err) + log.Error("LoadIssue(%d): %v", c.IssueID, err) return "" } @@ -210,7 +210,7 @@ func (c *Comment) IssueURL() string { err = c.Issue.loadRepo(x) if err != nil { // Silently dropping errors :unamused: - log.Error(4, "loadRepo(%d): %v", c.Issue.RepoID, err) + log.Error("loadRepo(%d): %v", c.Issue.RepoID, err) return "" } return c.Issue.HTMLURL() @@ -220,13 +220,13 @@ func (c *Comment) IssueURL() string { func (c *Comment) PRURL() string { err := c.LoadIssue() if err != nil { // Silently dropping errors :unamused: - log.Error(4, "LoadIssue(%d): %v", c.IssueID, err) + log.Error("LoadIssue(%d): %v", c.IssueID, err) return "" } err = c.Issue.loadRepo(x) if err != nil { // Silently dropping errors :unamused: - log.Error(4, "loadRepo(%d): %v", c.Issue.RepoID, err) + log.Error("loadRepo(%d): %v", c.Issue.RepoID, err) return "" } @@ -318,7 +318,7 @@ func (c *Comment) LoadPoster() error { c.PosterID = -1 c.Poster = NewGhostUser() } else { - log.Error(3, "getUserByID[%d]: %v", c.ID, err) + log.Error("getUserByID[%d]: %v", c.ID, err) } } return nil @@ -333,7 +333,7 @@ func (c *Comment) LoadAttachments() error { var err error c.Attachments, err = getAttachmentsByCommentID(x, c.ID) if err != nil { - log.Error(3, "getAttachmentsByCommentID[%d]: %v", c.ID, err) + log.Error("getAttachmentsByCommentID[%d]: %v", c.ID, err) } return nil } @@ -384,7 +384,7 @@ func (c *Comment) mailParticipants(e Engine, opType ActionType, issue *Issue) (e content = fmt.Sprintf("Reopened #%d", issue.Index) } if err = mailIssueCommentToParticipants(e, issue, c.Poster, content, c, mentions); err != nil { - log.Error(4, "mailIssueCommentToParticipants: %v", err) + log.Error("mailIssueCommentToParticipants: %v", err) } return nil @@ -492,12 +492,12 @@ func (c *Comment) MustAsDiff() *Diff { func (c *Comment) CodeCommentURL() string { err := c.LoadIssue() if err != nil { // Silently dropping errors :unamused: - log.Error(4, "LoadIssue(%d): %v", c.IssueID, err) + log.Error("LoadIssue(%d): %v", c.IssueID, err) return "" } err = c.Issue.loadRepo(x) if err != nil { // Silently dropping errors :unamused: - log.Error(4, "loadRepo(%d): %v", c.Issue.RepoID, err) + log.Error("loadRepo(%d): %v", c.Issue.RepoID, err) return "" } return fmt.Sprintf("%s/files#%s", c.Issue.HTMLURL(), c.HashTag()) @@ -638,7 +638,7 @@ func sendCreateCommentAction(e *xorm.Session, opts *CreateCommentOptions, commen // Notify watchers for whatever action comes in, ignore if no action type. if act.OpType > 0 { if err = notifyWatchers(e, act); err != nil { - log.Error(4, "notifyWatchers: %v", err) + log.Error("notifyWatchers: %v", err) } } return nil @@ -850,7 +850,7 @@ func CreateIssueComment(doer *User, repo *Repository, issue *Issue, content stri Repository: repo.APIFormat(mode), Sender: doer.APIFormat(), }); err != nil { - log.Error(2, "PrepareWebhooks [comment_id: %d]: %v", comment.ID, err) + log.Error("PrepareWebhooks [comment_id: %d]: %v", comment.ID, err) } else { go HookQueue.Add(repo.ID) } @@ -1053,7 +1053,7 @@ func UpdateComment(doer *User, c *Comment, oldContent string) error { Repository: c.Issue.Repo.APIFormat(mode), Sender: doer.APIFormat(), }); err != nil { - log.Error(2, "PrepareWebhooks [comment_id: %d]: %v", c.ID, err) + log.Error("PrepareWebhooks [comment_id: %d]: %v", c.ID, err) } else { go HookQueue.Add(c.Issue.Repo.ID) } @@ -1108,7 +1108,7 @@ func DeleteComment(doer *User, comment *Comment) error { Repository: comment.Issue.Repo.APIFormat(mode), Sender: doer.APIFormat(), }); err != nil { - log.Error(2, "PrepareWebhooks [comment_id: %d]: %v", comment.ID, err) + log.Error("PrepareWebhooks [comment_id: %d]: %v", comment.ID, err) } else { go HookQueue.Add(comment.Issue.Repo.ID) } |