Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Notification: queue ui.go notification-service #10281

Merged
merged 2 commits into from
Feb 16, 2020
Merged

Notification: queue ui.go notification-service #10281

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1645d24
Notification: queue ui.go notification-service
zeripath Nov 20, 2019
d8eb63b
Merge branch 'master' into separate-out-ui-notifier-queue
lafriks Feb 15, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 27 additions & 16 deletions modules/notification/ui/ui.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,16 @@ package ui

import (
"code.gitea.io/gitea/models"
"code.gitea.io/gitea/modules/graceful"
"code.gitea.io/gitea/modules/log"
"code.gitea.io/gitea/modules/notification/base"
"code.gitea.io/gitea/modules/queue"
)

type (
notificationService struct {
base.NullNotifier
issueQueue chan issueNotificationOpts
issueQueue queue.Queue
}

issueNotificationOpts struct {
Expand All @@ -29,19 +31,24 @@ var (

// NewNotifier create a new notificationService notifier
func NewNotifier() base.Notifier {
return &notificationService{
issueQueue: make(chan issueNotificationOpts, 100),
}
ns := &notificationService{}
lafriks marked this conversation as resolved.
Show resolved Hide resolved
ns.issueQueue = queue.CreateQueue("notification-service", ns.handle, issueNotificationOpts{})
return ns
}

func (ns *notificationService) Run() {
for opts := range ns.issueQueue {
func (ns *notificationService) handle(data ...queue.Data) {
for _, datum := range data {
opts := datum.(issueNotificationOpts)
if err := models.CreateOrUpdateIssueNotifications(opts.issueID, opts.commentID, opts.notificationAuthorID); err != nil {
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,
issue *models.Issue, comment *models.Comment) {
var opts = issueNotificationOpts{
Expand All @@ -51,35 +58,39 @@ func (ns *notificationService) NotifyCreateIssueComment(doer *models.User, repo
if comment != nil {
opts.commentID = comment.ID
}
ns.issueQueue <- opts
_ = ns.issueQueue.Push(opts)
}

func (ns *notificationService) NotifyNewIssue(issue *models.Issue) {
ns.issueQueue <- issueNotificationOpts{
_ = ns.issueQueue.Push(issueNotificationOpts{
issueID: issue.ID,
notificationAuthorID: issue.Poster.ID,
}
})
}

func (ns *notificationService) NotifyIssueChangeStatus(doer *models.User, issue *models.Issue, actionComment *models.Comment, isClosed bool) {
lafriks marked this conversation as resolved.
Show resolved Hide resolved
ns.issueQueue <- issueNotificationOpts{
_ = ns.issueQueue.Push(issueNotificationOpts{
issueID: issue.ID,
notificationAuthorID: doer.ID,
}
})
}

func (ns *notificationService) NotifyMergePullRequest(pr *models.PullRequest, doer *models.User) {
ns.issueQueue <- issueNotificationOpts{
_ = ns.issueQueue.Push(issueNotificationOpts{
issueID: pr.Issue.ID,
notificationAuthorID: doer.ID,
}
})
}

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,
notificationAuthorID: pr.Issue.PosterID,
}
})
}

func (ns *notificationService) NotifyPullRequestReview(pr *models.PullRequest, r *models.Review, c *models.Comment) {
Expand All @@ -90,5 +101,5 @@ func (ns *notificationService) NotifyPullRequestReview(pr *models.PullRequest, r
if c != nil {
opts.commentID = c.ID
}
ns.issueQueue <- opts
_ = ns.issueQueue.Push(opts)
}