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/gpg_key.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/gpg_key.go')
| -rw-r--r-- | models/gpg_key.go | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/models/gpg_key.go b/models/gpg_key.go index 03b0fd0f69..0352456e54 100644 --- a/models/gpg_key.go +++ b/models/gpg_key.go @@ -52,7 +52,7 @@ func (key *GPGKey) BeforeInsert() { func (key *GPGKey) AfterLoad(session *xorm.Session) { err := session.Where("primary_key_id=?", key.KeyID).Find(&key.SubsKey) if err != nil { - log.Error(3, "Find Sub GPGkeys[%d]: %v", key.KeyID, err) + log.Error("Find Sub GPGkeys[%s]: %v", key.KeyID, err) } } @@ -364,7 +364,7 @@ func ParseCommitWithSignature(c *git.Commit) *CommitVerification { //Parsing signature sig, err := extractSignature(c.Signature.Signature) if err != nil { //Skipping failed to extract sign - log.Error(3, "SignatureRead err: %v", err) + log.Error("SignatureRead err: %v", err) return &CommitVerification{ Verified: false, Reason: "gpg.error.extract_sign", @@ -377,7 +377,7 @@ func ParseCommitWithSignature(c *git.Commit) *CommitVerification { // We can expect this to often be an ErrUserNotExist. in the case // it is not, however, it is important to log it. if !IsErrUserNotExist(err) { - log.Error(3, "GetUserByEmail: %v", err) + log.Error("GetUserByEmail: %v", err) } return &CommitVerification{ Verified: false, @@ -387,7 +387,7 @@ func ParseCommitWithSignature(c *git.Commit) *CommitVerification { keys, err := ListGPGKeys(committer.ID) if err != nil { //Skipping failed to get gpg keys of user - log.Error(3, "ListGPGKeys: %v", err) + log.Error("ListGPGKeys: %v", err) return &CommitVerification{ Verified: false, Reason: "gpg.error.failed_retrieval_gpg_keys", @@ -411,7 +411,7 @@ func ParseCommitWithSignature(c *git.Commit) *CommitVerification { //Generating hash of commit hash, err := populateHash(sig.Hash, []byte(c.Signature.Payload)) if err != nil { //Skipping ailed to generate hash - log.Error(3, "PopulateHash: %v", err) + log.Error("PopulateHash: %v", err) return &CommitVerification{ Verified: false, Reason: "gpg.error.generate_hash", @@ -432,7 +432,7 @@ func ParseCommitWithSignature(c *git.Commit) *CommitVerification { //Generating hash of commit hash, err := populateHash(sig.Hash, []byte(c.Signature.Payload)) if err != nil { //Skipping ailed to generate hash - log.Error(3, "PopulateHash: %v", err) + log.Error("PopulateHash: %v", err) return &CommitVerification{ Verified: false, Reason: "gpg.error.generate_hash", |