From b730498f02e21e290574c2d8448a8b9d4c626c3b Mon Sep 17 00:00:00 2001
From: Morgan Bazalgette <git@howl.moe>
Date: Sun, 4 Mar 2018 03:45:01 +0100
Subject: [PATCH] Don't write to log NoCommitterAccount (#3621)
* Don't write to log NoCommitterAccount
It's way too verbose, and the information is also printed to the user
already. Fixes #3602.
* ignore err only if it's a ErrUserNotExist
* Replace with IsErrUserNotExist
---
models/gpg_key.go | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/models/gpg_key.go b/models/gpg_key.go
index b7d86c8bfe..45da889504 100644
--- a/models/gpg_key.go
+++ b/models/gpg_key.go
@@ -374,7 +374,11 @@ func ParseCommitWithSignature(c *git.Commit) *CommitVerification {
//Find Committer account
committer, err := GetUserByEmail(c.Committer.Email) //This find the user by primary email or activated email so commit will not be valid if email is not
if err != nil { //Skipping not user for commiter
- log.Error(3, "NoCommitterAccount: %v", err)
+ // 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)
+ }
return &CommitVerification{
Verified: false,
Reason: "gpg.error.no_committer_account",