core
/
gitea
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Notification: queue ui.go notification-service (#10281) 

Co-authored-by: Lauris BH <lauris@nix.lv>
This commit is contained in:
zeripath 2020-02-16 00:29:43 +00:00 committed by GitHub
parent 5563d56a32
commit 791b109d6f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 27 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
modules/notification/ui/ui.go
View File

@ -6,14 +6,16 @@ package ui
import ( import (
"code.gitea.io/gitea/models" "code.gitea.io/gitea/models"
"code.gitea.io/gitea/modules/graceful"
"code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/log"
"code.gitea.io/gitea/modules/notification/base" "code.gitea.io/gitea/modules/notification/base"
"code.gitea.io/gitea/modules/queue"
) )
type ( type (
notificationService struct { notificationService struct {
base.NullNotifier base.NullNotifier
issueQueue chan issueNotificationOpts issueQueue queue.Queue
} }
issueNotificationOpts struct { issueNotificationOpts struct {
@ -29,19 +31,24 @@ var (
// NewNotifier create a new notificationService notifier // NewNotifier create a new notificationService notifier
func NewNotifier() base.Notifier { func NewNotifier() base.Notifier {
return &notificationService{ ns := &notificationService{}
issueQueue: make(chan issueNotificationOpts, 100), ns.issueQueue = queue.CreateQueue("notification-service", ns.handle, issueNotificationOpts{})
} return ns
} }
func (ns *notificationService) Run() { func (ns *notificationService) handle(data ...queue.Data) {
for opts := range ns.issueQueue { for _, datum := range data {
opts := datum.(issueNotificationOpts)
if err := models.CreateOrUpdateIssueNotifications(opts.issueID, opts.commentID, opts.notificationAuthorID); err != nil { if err := models.CreateOrUpdateIssueNotifications(opts.issueID, opts.commentID, opts.notificationAuthorID); err != nil {
log.Error("Was unable to create issue notification: %v", err) log.Error("Was unable to create issue notification: %v", err)
} }
} }
} }
func (ns *notificationService) Run() {
graceful.GetManager().RunWithShutdownFns(ns.issueQueue.Run)
}
func (ns *notificationService) NotifyCreateIssueComment(doer *models.User, repo *models.Repository, func (ns *notificationService) NotifyCreateIssueComment(doer *models.User, repo *models.Repository,
issue *models.Issue, comment *models.Comment) { issue *models.Issue, comment *models.Comment) {
var opts = issueNotificationOpts{ var opts = issueNotificationOpts{
@ -51,35 +58,39 @@ func (ns *notificationService) NotifyCreateIssueComment(doer *models.User, repo
if comment != nil { if comment != nil {
opts.commentID = comment.ID opts.commentID = comment.ID
} }
ns.issueQueue <- opts _ = ns.issueQueue.Push(opts)
} }
func (ns *notificationService) NotifyNewIssue(issue *models.Issue) { func (ns *notificationService) NotifyNewIssue(issue *models.Issue) {
ns.issueQueue <- issueNotificationOpts{ _ = ns.issueQueue.Push(issueNotificationOpts{
issueID: issue.ID, issueID: issue.ID,
notificationAuthorID: issue.Poster.ID, notificationAuthorID: issue.Poster.ID,
} })
} }
func (ns *notificationService) NotifyIssueChangeStatus(doer *models.User, issue *models.Issue, actionComment *models.Comment, isClosed bool) { func (ns *notificationService) NotifyIssueChangeStatus(doer *models.User, issue *models.Issue, actionComment *models.Comment, isClosed bool) {
ns.issueQueue <- issueNotificationOpts{ _ = ns.issueQueue.Push(issueNotificationOpts{
issueID: issue.ID, issueID: issue.ID,
notificationAuthorID: doer.ID, notificationAuthorID: doer.ID,
} })
} }
func (ns *notificationService) NotifyMergePullRequest(pr *models.PullRequest, doer *models.User) { func (ns *notificationService) NotifyMergePullRequest(pr *models.PullRequest, doer *models.User) {
ns.issueQueue <- issueNotificationOpts{ _ = ns.issueQueue.Push(issueNotificationOpts{
issueID: pr.Issue.ID, issueID: pr.Issue.ID,
notificationAuthorID: doer.ID, notificationAuthorID: doer.ID,
} })
} }
func (ns *notificationService) NotifyNewPullRequest(pr *models.PullRequest) { func (ns *notificationService) NotifyNewPullRequest(pr *models.PullRequest) {
ns.issueQueue <- issueNotificationOpts{ if err := pr.LoadIssue(); err != nil {
log.Error("Unable to load issue: %d for pr: %d: Error: %v", pr.IssueID, pr.ID, err)
return
}
_ = ns.issueQueue.Push(issueNotificationOpts{
issueID: pr.Issue.ID, issueID: pr.Issue.ID,
notificationAuthorID: pr.Issue.PosterID, notificationAuthorID: pr.Issue.PosterID,
} })
} }
func (ns *notificationService) NotifyPullRequestReview(pr *models.PullRequest, r *models.Review, c *models.Comment) { func (ns *notificationService) NotifyPullRequestReview(pr *models.PullRequest, r *models.Review, c *models.Comment) {
@ -90,5 +101,5 @@ func (ns *notificationService) NotifyPullRequestReview(pr *models.PullRequest, r
if c != nil { if c != nil {
opts.commentID = c.ID opts.commentID = c.ID
} }
ns.issueQueue <- opts _ = ns.issueQueue.Push(opts)
} }