diff options
| author | ᴜɴᴋɴᴡᴏɴ <u@gogs.io> | 2020-03-16 01:22:27 +0800 |
|---|---|---|
| committer | ᴜɴᴋɴᴡᴏɴ <u@gogs.io> | 2020-03-16 01:22:27 +0800 |
| commit | 9e9ca66467116e9079a2639c00e9e623aca23015 (patch) | |
| tree | dacdef5392608ff7107e4dd498959d4899e13e54 /internal/db/action.go | |
| parent | 82ff0c5852f29daa5f95d965fd50665581e7ea3c (diff) | |
refactor: unify error handling in routing layer
Diffstat (limited to 'internal/db/action.go')
| -rw-r--r-- | internal/db/action.go | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/internal/db/action.go b/internal/db/action.go index 0b803836..77938f02 100644 --- a/internal/db/action.go +++ b/internal/db/action.go @@ -20,7 +20,6 @@ import ( api "github.com/gogs/go-gogs-client" "gogs.io/gogs/internal/conf" - "gogs.io/gogs/internal/db/errors" "gogs.io/gogs/internal/lazyregexp" "gogs.io/gogs/internal/tool" ) @@ -256,16 +255,16 @@ func (pc *PushCommits) ToApiPayloadCommits(repoPath, repoURL string) ([]*api.Pay author, err := GetUserByEmail(commit.AuthorEmail) if err == nil { authorUsername = author.Name - } else if !errors.IsUserNotExist(err) { - return nil, fmt.Errorf("GetUserByEmail: %v", err) + } else if !IsErrUserNotExist(err) { + return nil, fmt.Errorf("get user by email: %v", err) } committerUsername := "" committer, err := GetUserByEmail(commit.CommitterEmail) if err == nil { committerUsername = committer.Name - } else if !errors.IsUserNotExist(err) { - return nil, fmt.Errorf("GetUserByEmail: %v", err) + } else if !IsErrUserNotExist(err) { + return nil, fmt.Errorf("get user by email: %v", err) } nameStatus, err := git.RepoShowNameStatus(repoPath, commit.Sha1) @@ -304,8 +303,8 @@ func (pcs *PushCommits) AvatarLink(email string) string { u, err := GetUserByEmail(email) if err != nil { pcs.avatars[email] = tool.AvatarLink(email) - if !errors.IsUserNotExist(err) { - log.Error("GetUserByEmail: %v", err) + if !IsErrUserNotExist(err) { + log.Error("get user by email: %v", err) } } else { pcs.avatars[email] = u.RelAvatarLink() @@ -341,7 +340,7 @@ func UpdateIssuesCommit(doer *User, repo *Repository, commits []*PushCommit) err issue, err := GetIssueByRef(ref) if err != nil { - if errors.IsIssueNotExist(err) { + if IsErrIssueNotExist(err) { continue } return err @@ -383,7 +382,7 @@ func UpdateIssuesCommit(doer *User, repo *Repository, commits []*PushCommit) err issue, err := GetIssueByRef(ref) if err != nil { - if errors.IsIssueNotExist(err) { + if IsErrIssueNotExist(err) { continue } return err @@ -423,7 +422,7 @@ func UpdateIssuesCommit(doer *User, repo *Repository, commits []*PushCommit) err issue, err := GetIssueByRef(ref) if err != nil { - if errors.IsIssueNotExist(err) { + if IsErrIssueNotExist(err) { continue } return err |