use new logging

techknowlogick · lunny · commit bf4bcfb26c13 · 2019-05-24T12:41:46.000+08:00
diff --git a/models/pull.go b/models/pull.go
@@ -621,7 +621,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(4, "ToAPIPayloadCommits: %v", err)
+		log.Error("ToAPIPayloadCommits: %v", err)
 		return nil
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -621,7 +621,7 @@ func (pr PullRequest) Merge(doer User, baseGitRepo *git.Repository, mergeStyle`
`621`	`621`
`622`	`622`	`commits, err := ListToPushCommits(l).ToAPIPayloadCommits(pr.BaseRepo.RepoPath(), pr.BaseRepo.HTMLURL())`
`623`	`623`	`if err != nil {`
`624`		`- log.Error(4, "ToAPIPayloadCommits: %v", err)`
	`624`	`+ log.Error("ToAPIPayloadCommits: %v", err)`
`625`	`625`	`return nil`
`626`	`626`	`}`
`627`	`627`