aboutsummaryrefslogtreecommitdiff
path: root/internal/db/pull.go
diff options
context:
space:
mode:
Diffstat (limited to 'internal/db/pull.go')
-rw-r--r--internal/db/pull.go48
1 files changed, 24 insertions, 24 deletions
diff --git a/internal/db/pull.go b/internal/db/pull.go
index ccc46231..268927eb 100644
--- a/internal/db/pull.go
+++ b/internal/db/pull.go
@@ -12,7 +12,7 @@ import (
"time"
"github.com/unknwon/com"
- log "gopkg.in/clog.v1"
+ log "unknwon.dev/clog/v2"
"xorm.io/xorm"
"github.com/gogs/git-module"
@@ -331,12 +331,12 @@ func (pr *PullRequest) Merge(doer *User, baseGitRepo *git.Repository, mergeStyle
}
if err = MergePullRequestAction(doer, pr.Issue.Repo, pr.Issue); err != nil {
- log.Error(2, "MergePullRequestAction [%d]: %v", pr.ID, err)
+ log.Error("MergePullRequestAction [%d]: %v", pr.ID, err)
}
// Reload pull request information.
if err = pr.LoadAttributes(); err != nil {
- log.Error(2, "LoadAttributes: %v", err)
+ log.Error("LoadAttributes: %v", err)
return nil
}
if err = PrepareWebhooks(pr.Issue.Repo, HOOK_EVENT_PULL_REQUEST, &api.PullRequestPayload{
@@ -346,13 +346,13 @@ func (pr *PullRequest) Merge(doer *User, baseGitRepo *git.Repository, mergeStyle
Repository: pr.Issue.Repo.APIFormat(nil),
Sender: doer.APIFormat(),
}); err != nil {
- log.Error(2, "PrepareWebhooks: %v", err)
+ log.Error("PrepareWebhooks: %v", err)
return nil
}
l, err := headGitRepo.CommitsBetweenIDs(pr.MergedCommitID, pr.MergeBase)
if err != nil {
- log.Error(2, "CommitsBetweenIDs: %v", err)
+ log.Error("CommitsBetweenIDs: %v", err)
return nil
}
@@ -361,7 +361,7 @@ func (pr *PullRequest) Merge(doer *User, baseGitRepo *git.Repository, mergeStyle
// to avoid strange diff commits produced.
mergeCommit, err := baseGitRepo.GetBranchCommit(pr.BaseBranch)
if err != nil {
- log.Error(2, "GetBranchCommit: %v", err)
+ log.Error("GetBranchCommit: %v", err)
return nil
}
if mergeStyle == MERGE_STYLE_REGULAR {
@@ -370,7 +370,7 @@ func (pr *PullRequest) Merge(doer *User, baseGitRepo *git.Repository, mergeStyle
commits, err := ListToPushCommits(l).ToApiPayloadCommits(pr.BaseRepo.RepoPath(), pr.BaseRepo.HTMLURL())
if err != nil {
- log.Error(2, "ToApiPayloadCommits: %v", err)
+ log.Error("ToApiPayloadCommits: %v", err)
return nil
}
@@ -385,7 +385,7 @@ func (pr *PullRequest) Merge(doer *User, baseGitRepo *git.Repository, mergeStyle
Sender: doer.APIFormat(),
}
if err = PrepareWebhooks(pr.BaseRepo, HOOK_EVENT_PUSH, p); err != nil {
- log.Error(2, "PrepareWebhooks: %v", err)
+ log.Error("PrepareWebhooks: %v", err)
return nil
}
return nil
@@ -490,10 +490,10 @@ func NewPullRequest(repo *Repository, pull *Issue, labelIDs []int64, uuids []str
RepoName: repo.Name,
IsPrivate: repo.IsPrivate,
}); err != nil {
- log.Error(2, "NotifyWatchers: %v", err)
+ log.Error("NotifyWatchers: %v", err)
}
if err = pull.MailParticipants(); err != nil {
- log.Error(2, "MailParticipants: %v", err)
+ log.Error("MailParticipants: %v", err)
}
pr.Issue = pull
@@ -505,7 +505,7 @@ func NewPullRequest(repo *Repository, pull *Issue, labelIDs []int64, uuids []str
Repository: repo.APIFormat(nil),
Sender: pull.Poster.APIFormat(),
}); err != nil {
- log.Error(2, "PrepareWebhooks: %v", err)
+ log.Error("PrepareWebhooks: %v", err)
}
return nil
@@ -667,7 +667,7 @@ func (pr *PullRequest) AddToTaskQueue() {
go PullRequestQueue.AddFunc(pr.ID, func() {
pr.Status = PULL_REQUEST_STATUS_CHECKING
if err := pr.UpdateCols("status"); err != nil {
- log.Error(3, "AddToTaskQueue.UpdateCols[%d].(add to queue): %v", pr.ID, err)
+ log.Error("AddToTaskQueue.UpdateCols[%d].(add to queue): %v", pr.ID, err)
}
})
}
@@ -717,10 +717,10 @@ func addHeadRepoTasks(prs []*PullRequest) {
for _, pr := range prs {
log.Trace("addHeadRepoTasks[%d]: composing new test task", pr.ID)
if err := pr.UpdatePatch(); err != nil {
- log.Error(4, "UpdatePatch: %v", err)
+ log.Error("UpdatePatch: %v", err)
continue
} else if err := pr.PushToBaseRepo(); err != nil {
- log.Error(4, "PushToBaseRepo: %v", err)
+ log.Error("PushToBaseRepo: %v", err)
continue
}
@@ -734,20 +734,20 @@ func AddTestPullRequestTask(doer *User, repoID int64, branch string, isSync bool
log.Trace("AddTestPullRequestTask [head_repo_id: %d, head_branch: %s]: finding pull requests", repoID, branch)
prs, err := GetUnmergedPullRequestsByHeadInfo(repoID, branch)
if err != nil {
- log.Error(2, "Find pull requests [head_repo_id: %d, head_branch: %s]: %v", repoID, branch, err)
+ log.Error("Find pull requests [head_repo_id: %d, head_branch: %s]: %v", repoID, branch, err)
return
}
if isSync {
if err = PullRequestList(prs).LoadAttributes(); err != nil {
- log.Error(2, "PullRequestList.LoadAttributes: %v", err)
+ log.Error("PullRequestList.LoadAttributes: %v", err)
}
if err == nil {
for _, pr := range prs {
pr.Issue.PullRequest = pr
if err = pr.Issue.LoadAttributes(); err != nil {
- log.Error(2, "LoadAttributes: %v", err)
+ log.Error("LoadAttributes: %v", err)
continue
}
if err = PrepareWebhooks(pr.Issue.Repo, HOOK_EVENT_PULL_REQUEST, &api.PullRequestPayload{
@@ -757,7 +757,7 @@ func AddTestPullRequestTask(doer *User, repoID int64, branch string, isSync bool
Repository: pr.Issue.Repo.APIFormat(nil),
Sender: doer.APIFormat(),
}); err != nil {
- log.Error(2, "PrepareWebhooks [pull_id: %v]: %v", pr.ID, err)
+ log.Error("PrepareWebhooks [pull_id: %v]: %v", pr.ID, err)
continue
}
}
@@ -769,7 +769,7 @@ func AddTestPullRequestTask(doer *User, repoID int64, branch string, isSync bool
log.Trace("AddTestPullRequestTask [base_repo_id: %d, base_branch: %s]: finding pull requests", repoID, branch)
prs, err = GetUnmergedPullRequestsByBaseInfo(repoID, branch)
if err != nil {
- log.Error(2, "Find pull requests [base_repo_id: %d, base_branch: %s]: %v", repoID, branch, err)
+ log.Error("Find pull requests [base_repo_id: %d, base_branch: %s]: %v", repoID, branch, err)
return
}
for _, pr := range prs {
@@ -796,7 +796,7 @@ func (pr *PullRequest) checkAndUpdateStatus() {
// Make sure there is no waiting test to process before levaing the checking status.
if !PullRequestQueue.Exist(pr.ID) {
if err := pr.UpdateCols("status"); err != nil {
- log.Error(4, "Update[%d]: %v", pr.ID, err)
+ log.Error("Update[%d]: %v", pr.ID, err)
}
}
}
@@ -812,12 +812,12 @@ func TestPullRequests() {
pr := bean.(*PullRequest)
if err := pr.LoadAttributes(); err != nil {
- log.Error(3, "LoadAttributes: %v", err)
+ log.Error("LoadAttributes: %v", err)
return nil
}
if err := pr.testPatch(); err != nil {
- log.Error(3, "testPatch: %v", err)
+ log.Error("testPatch: %v", err)
return nil
}
prs = append(prs, pr)
@@ -836,10 +836,10 @@ func TestPullRequests() {
pr, err := GetPullRequestByID(com.StrTo(prID).MustInt64())
if err != nil {
- log.Error(4, "GetPullRequestByID[%s]: %v", prID, err)
+ log.Error("GetPullRequestByID[%s]: %v", prID, err)
continue
} else if err = pr.testPatch(); err != nil {
- log.Error(4, "testPatch[%d]: %v", pr.ID, err)
+ log.Error("testPatch[%d]: %v", pr.ID, err)
continue
}
Powered by cgit, Themed by Ted Yin.