Skip to content

Rename HookQueue to hookQueue #8778

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

Merged
merged 2 commits into from
Nov 2, 2019
Merged

Rename HookQueue to hookQueue #8778

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5676655
Rename HookQueue to hookQueue
lunny Nov 2, 2019
9817218
fix lint
lunny Nov 2, 2019
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
27 changes: 0 additions & 27 deletions modules/notification/webhook/webhook.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,6 @@ func (m *webhookNotifier) NotifyIssueClearLabels(doer *models.User, issue *model
}
if err != nil {
log.Error("PrepareWebhooks [is_pull: %v]: %v", issue.IsPull, err)
} else {
go webhook_module.HookQueue.Add(issue.RepoID)
}
}

Expand All @@ -78,8 +76,6 @@ func (m *webhookNotifier) NotifyForkRepository(doer *models.User, oldRepo, repo
Sender: doer.APIFormat(),
}); err != nil {
log.Error("PrepareWebhooks [repo_id: %d]: %v", oldRepo.ID, err)
} else {
go webhook_module.HookQueue.Add(oldRepo.ID)
}

u := repo.MustOwner()
Expand All @@ -93,8 +89,6 @@ func (m *webhookNotifier) NotifyForkRepository(doer *models.User, oldRepo, repo
Sender: doer.APIFormat(),
}); err != nil {
log.Error("PrepareWebhooks [repo_id: %d]: %v", repo.ID, err)
} else {
go webhook_module.HookQueue.Add(repo.ID)
}
}
}
Expand All @@ -109,8 +103,6 @@ func (m *webhookNotifier) NotifyCreateRepository(doer *models.User, u *models.Us
Sender: doer.APIFormat(),
}); err != nil {
log.Error("PrepareWebhooks [repo_id: %d]: %v", repo.ID, err)
} else {
go webhook_module.HookQueue.Add(repo.ID)
}
}
}
Expand All @@ -127,7 +119,6 @@ func (m *webhookNotifier) NotifyDeleteRepository(doer *models.User, repo *models
}); err != nil {
log.Error("PrepareWebhooks [repo_id: %d]: %v", repo.ID, err)
}
go webhook_module.HookQueue.Add(repo.ID)
}
}

Expand Down Expand Up @@ -175,8 +166,6 @@ func (m *webhookNotifier) NotifyIssueChangeAssignee(doer *models.User, issue *mo
return
}
}

go webhook_module.HookQueue.Add(issue.RepoID)
}

func (m *webhookNotifier) NotifyIssueChangeTitle(doer *models.User, issue *models.Issue, oldTitle string) {
Expand Down Expand Up @@ -217,8 +206,6 @@ func (m *webhookNotifier) NotifyIssueChangeTitle(doer *models.User, issue *model

if err != nil {
log.Error("PrepareWebhooks [is_pull: %v]: %v", issue.IsPull, err)
} else {
go webhook_module.HookQueue.Add(issue.RepoID)
}
}

Expand Down Expand Up @@ -259,8 +246,6 @@ func (m *webhookNotifier) NotifyIssueChangeStatus(doer *models.User, issue *mode
}
if err != nil {
log.Error("PrepareWebhooks [is_pull: %v, is_closed: %v]: %v", issue.IsPull, isClosed, err)
} else {
go webhook_module.HookQueue.Add(issue.Repo.ID)
}
}

Expand All @@ -274,8 +259,6 @@ func (m *webhookNotifier) NotifyNewIssue(issue *models.Issue) {
Sender: issue.Poster.APIFormat(),
}); err != nil {
log.Error("PrepareWebhooks: %v", err)
} else {
go webhook_module.HookQueue.Add(issue.RepoID)
}
}

Expand Down Expand Up @@ -312,8 +295,6 @@ func (m *webhookNotifier) NotifyIssueChangeContent(doer *models.User, issue *mod
}
if err != nil {
log.Error("PrepareWebhooks [is_pull: %v]: %v", issue.IsPull, err)
} else {
go webhook_module.HookQueue.Add(issue.RepoID)
}
}

Expand Down Expand Up @@ -347,8 +328,6 @@ func (m *webhookNotifier) NotifyUpdateComment(doer *models.User, c *models.Comme
IsPull: c.Issue.IsPull,
}); err != nil {
log.Error("PrepareWebhooks [comment_id: %d]: %v", c.ID, err)
} else {
go webhook_module.HookQueue.Add(c.Issue.Repo.ID)
}
}

Expand All @@ -364,8 +343,6 @@ func (m *webhookNotifier) NotifyCreateIssueComment(doer *models.User, repo *mode
IsPull: issue.IsPull,
}); err != nil {
log.Error("PrepareWebhooks [comment_id: %d]: %v", comment.ID, err)
} else {
go webhook_module.HookQueue.Add(repo.ID)
}
}

Expand Down Expand Up @@ -395,8 +372,6 @@ func (m *webhookNotifier) NotifyDeleteComment(doer *models.User, comment *models
IsPull: comment.Issue.IsPull,
}); err != nil {
log.Error("PrepareWebhooks [comment_id: %d]: %v", comment.ID, err)
} else {
go webhook_module.HookQueue.Add(comment.Issue.Repo.ID)
}
}

Expand Down Expand Up @@ -442,7 +417,5 @@ func (m *webhookNotifier) NotifyIssueChangeLabels(doer *models.User, issue *mode
}
if err != nil {
log.Error("PrepareWebhooks [is_pull: %v]: %v", issue.IsPull, err)
} else {
go webhook_module.HookQueue.Add(issue.RepoID)
}
}
4 changes: 0 additions & 4 deletions modules/repofiles/action.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,10 +112,6 @@ func CommitRepoAction(opts CommitRepoActionOptions) error {
return fmt.Errorf("NotifyWatchers: %v", err)
}

defer func() {
go webhook.HookQueue.Add(repo.ID)
}()

apiPusher := pusher.APIFormat()
apiRepo := repo.APIFormat(models.AccessModeNone)

Expand Down
4 changes: 2 additions & 2 deletions modules/webhook/deliver.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,9 +159,9 @@ func DeliverHooks() {
}

// Start listening on new hook requests.
for repoIDStr := range HookQueue.Queue() {
for repoIDStr := range hookQueue.Queue() {
log.Trace("DeliverHooks [repo_id: %v]", repoIDStr)
HookQueue.Remove(repoIDStr)
hookQueue.Remove(repoIDStr)

repoID, err := com.StrTo(repoIDStr).Int64()
if err != nil {
Expand Down
18 changes: 14 additions & 4 deletions modules/webhook/webhook.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ import (
"github.com/gobwas/glob"
)

// HookQueue is a global queue of web hooks
var HookQueue = sync.NewUniqueQueue(setting.Webhook.QueueLength)
// hookQueue is a global queue of web hooks
var hookQueue = sync.NewUniqueQueue(setting.Webhook.QueueLength)

// getPayloadBranch returns branch for hook event, if applicable.
func getPayloadBranch(p api.Payloader) string {
Expand All @@ -44,7 +44,12 @@ func getPayloadBranch(p api.Payloader) string {

// PrepareWebhook adds special webhook to task queue for given payload.
func PrepareWebhook(w *models.Webhook, repo *models.Repository, event models.HookEventType, p api.Payloader) error {
return prepareWebhook(w, repo, event, p)
if err := prepareWebhook(w, repo, event, p); err != nil {
return err
}

go hookQueue.Add(repo.ID)
return nil
}

func checkBranch(w *models.Webhook, branch string) bool {
Expand Down Expand Up @@ -147,7 +152,12 @@ func prepareWebhook(w *models.Webhook, repo *models.Repository, event models.Hoo

// PrepareWebhooks adds new webhooks to task queue for given payload.
func PrepareWebhooks(repo *models.Repository, event models.HookEventType, p api.Payloader) error {
return prepareWebhooks(repo, event, p)
if err := prepareWebhooks(repo, event, p); err != nil {
return err
}

go hookQueue.Add(repo.ID)
return nil
}

func prepareWebhooks(repo *models.Repository, event models.HookEventType, p api.Payloader) error {
Expand Down
2 changes: 1 addition & 1 deletion routers/api/v1/repo/hook.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ func TestHook(ctx *context.APIContext) {
ctx.Error(500, "PrepareWebhook: ", err)
return
}
go webhook.HookQueue.Add(ctx.Repo.Repository.ID)

ctx.Status(204)
}

Expand Down
2 changes: 0 additions & 2 deletions routers/repo/pull.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ import (
"code.gitea.io/gitea/modules/notification"
"code.gitea.io/gitea/modules/setting"
"code.gitea.io/gitea/modules/util"
"code.gitea.io/gitea/modules/webhook"
"code.gitea.io/gitea/services/gitdiff"
pull_service "code.gitea.io/gitea/services/pull"
repo_service "code.gitea.io/gitea/services/repository"
Expand Down Expand Up @@ -824,7 +823,6 @@ func TriggerTask(ctx *context.Context) {

log.Trace("TriggerTask '%s/%s' by %s", repo.Name, branch, pusher.Name)

go webhook.HookQueue.Add(repo.ID)
go pull_service.AddTestPullRequestTask(pusher, repo.ID, branch, true)
ctx.Status(202)
}
Expand Down
1 change: 0 additions & 1 deletion routers/repo/webhook.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -869,7 +869,6 @@ func TestWebhook(ctx *context.Context) {
ctx.Flash.Error("PrepareWebhook: " + err.Error())
ctx.Status(500)
} else {
go webhook.HookQueue.Add(ctx.Repo.Repository.ID)
ctx.Flash.Info(ctx.Tr("repo.settings.webhook.test_delivery_success"))
ctx.Status(200)
}
Expand Down
2 changes: 0 additions & 2 deletions services/milestone/milestone.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,6 @@ func ChangeMilestoneAssign(issue *models.Issue, doer *models.User, oldMilestoneI
}
if err != nil {
log.Error("PrepareWebhooks [is_pull: %v]: %v", issue.IsPull, err)
} else {
go webhook.HookQueue.Add(issue.RepoID)
}
return nil
}
4 changes: 0 additions & 4 deletions services/mirror/sync.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,6 @@ func syncAction(opType models.ActionType, repo *models.Repository, refName strin
return fmt.Errorf("notifyWatchers: %v", err)
}

defer func() {
go webhook.HookQueue.Add(repo.ID)
}()

return nil
}

Expand Down
2 changes: 0 additions & 2 deletions services/pull/merge.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -369,8 +369,6 @@ func Merge(pr *models.PullRequest, doer *models.User, baseGitRepo *git.Repositor
Sender: doer.APIFormat(),
}); err != nil {
log.Error("PrepareWebhooks: %v", err)
} else {
go webhook.HookQueue.Add(pr.Issue.Repo.ID)
}

return nil
Expand Down
3 changes: 0 additions & 3 deletions services/pull/pull.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,6 @@ func NewPullRequest(repo *models.Repository, pull *models.Issue, labelIDs []int6
Sender: pull.Poster.APIFormat(),
}); err != nil {
log.Error("PrepareWebhooks: %v", err)
} else {
go webhook.HookQueue.Add(repo.ID)
}

return nil
Expand Down Expand Up @@ -125,7 +123,6 @@ func AddTestPullRequestTask(doer *models.User, repoID int64, branch string, isSy
log.Error("PrepareWebhooks [pull_id: %v]: %v", pr.ID, err)
continue
}
go webhook.HookQueue.Add(pr.Issue.Repo.ID)
}
}

Expand Down
9 changes: 2 additions & 7 deletions services/pull/review.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ func reviewHook(review *models.Review) error {
if err != nil {
return err
}
if err := webhook.PrepareWebhooks(review.Issue.Repo, reviewHookType, &api.PullRequestPayload{
return webhook.PrepareWebhooks(review.Issue.Repo, reviewHookType, &api.PullRequestPayload{
Action: api.HookIssueSynchronized,
Index: review.Issue.Index,
PullRequest: pr.APIFormat(),
Expand All @@ -66,10 +66,5 @@ func reviewHook(review *models.Review) error {
Type: string(reviewHookType),
Content: review.Content,
},
}); err != nil {
return err
}
go webhook.HookQueue.Add(review.Issue.Repo.ID)

return nil
})
}
6 changes: 0 additions & 6 deletions services/release/release.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,8 +92,6 @@ func CreateRelease(gitRepo *git.Repository, rel *models.Release, attachmentUUIDs
Sender: rel.Publisher.APIFormat(),
}); err != nil {
log.Error("PrepareWebhooks: %v", err)
} else {
go webhook.HookQueue.Add(rel.Repo.ID)
}
}
}
Expand Down Expand Up @@ -129,8 +127,6 @@ func UpdateRelease(doer *models.User, gitRepo *git.Repository, rel *models.Relea
Sender: doer.APIFormat(),
}); err1 != nil {
log.Error("PrepareWebhooks: %v", err)
} else {
go webhook.HookQueue.Add(rel.Repo.ID)
}

return err
Expand Down Expand Up @@ -195,8 +191,6 @@ func DeleteReleaseByID(id int64, doer *models.User, delTag bool) error {
Sender: doer.APIFormat(),
}); err != nil {
log.Error("PrepareWebhooks: %v", err)
} else {
go webhook.HookQueue.Add(rel.Repo.ID)
}

return nil
Expand Down