Skip to content

Commit f518fe6

Browse files
lunnylunny
authored
Rename HookQueue to hookQueue (#8778)
* Rename HookQueue to hookQueue * fix lint
1 parent 4b8d9e5 commit f518fe6

File tree

13 files changed

+19
-65
lines changed

13 files changed

+19
-65
lines changed

‎modules/notification/webhook/webhook.go

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,6 @@ func (m *webhookNotifier) NotifyIssueClearLabels(doer *models.User, issue *model
6262
}
6363
if err != nil {
6464
log.Error("PrepareWebhooks [is_pull: %v]: %v", issue.IsPull, err)
65-
} else {
66-
go webhook_module.HookQueue.Add(issue.RepoID)
6765
}
6866
}
6967

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

8581
u := repo.MustOwner()
@@ -93,8 +89,6 @@ func (m *webhookNotifier) NotifyForkRepository(doer *models.User, oldRepo, repo
9389
Sender: doer.APIFormat(),
9490
}); err != nil {
9591
log.Error("PrepareWebhooks [repo_id: %d]: %v", repo.ID, err)
96-
} else {
97-
go webhook_module.HookQueue.Add(repo.ID)
9892
}
9993
}
10094
}
@@ -109,8 +103,6 @@ func (m *webhookNotifier) NotifyCreateRepository(doer *models.User, u *models.Us
109103
Sender: doer.APIFormat(),
110104
}); err != nil {
111105
log.Error("PrepareWebhooks [repo_id: %d]: %v", repo.ID, err)
112-
} else {
113-
go webhook_module.HookQueue.Add(repo.ID)
114106
}
115107
}
116108
}
@@ -127,7 +119,6 @@ func (m *webhookNotifier) NotifyDeleteRepository(doer *models.User, repo *models
127119
}); err != nil {
128120
log.Error("PrepareWebhooks [repo_id: %d]: %v", repo.ID, err)
129121
}
130-
go webhook_module.HookQueue.Add(repo.ID)
131122
}
132123
}
133124

@@ -175,8 +166,6 @@ func (m *webhookNotifier) NotifyIssueChangeAssignee(doer *models.User, issue *mo
175166
return
176167
}
177168
}
178-
179-
go webhook_module.HookQueue.Add(issue.RepoID)
180169
}
181170

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

218207
if err != nil {
219208
log.Error("PrepareWebhooks [is_pull: %v]: %v", issue.IsPull, err)
220-
} else {
221-
go webhook_module.HookQueue.Add(issue.RepoID)
222209
}
223210
}
224211

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

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

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

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

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

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

@@ -442,7 +417,5 @@ func (m *webhookNotifier) NotifyIssueChangeLabels(doer *models.User, issue *mode
442417
}
443418
if err != nil {
444419
log.Error("PrepareWebhooks [is_pull: %v]: %v", issue.IsPull, err)
445-
} else {
446-
go webhook_module.HookQueue.Add(issue.RepoID)
447420
}
448421
}

‎modules/repofiles/action.go

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -112,10 +112,6 @@ func CommitRepoAction(opts CommitRepoActionOptions) error {
112112
return fmt.Errorf("NotifyWatchers: %v", err)
113113
}
114114

115-
defer func() {
116-
go webhook.HookQueue.Add(repo.ID)
117-
}()
118-
119115
apiPusher := pusher.APIFormat()
120116
apiRepo := repo.APIFormat(models.AccessModeNone)
121117

‎modules/webhook/deliver.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -159,9 +159,9 @@ func DeliverHooks() {
159159
}
160160

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

166166
repoID, err := com.StrTo(repoIDStr).Int64()
167167
if err != nil {

‎modules/webhook/webhook.go

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ import (
2020
"github.com/gobwas/glob"
2121
)
2222

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

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

4545
// PrepareWebhook adds special webhook to task queue for given payload.
4646
func PrepareWebhook(w *models.Webhook, repo *models.Repository, event models.HookEventType, p api.Payloader) error {
47-
return prepareWebhook(w, repo, event, p)
47+
if err := prepareWebhook(w, repo, event, p); err != nil {
48+
return err
49+
}
50+
51+
go hookQueue.Add(repo.ID)
52+
return nil
4853
}
4954

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

148153
// PrepareWebhooks adds new webhooks to task queue for given payload.
149154
func PrepareWebhooks(repo *models.Repository, event models.HookEventType, p api.Payloader) error {
150-
return prepareWebhooks(repo, event, p)
155+
if err := prepareWebhooks(repo, event, p); err != nil {
156+
return err
157+
}
158+
159+
go hookQueue.Add(repo.ID)
160+
return nil
151161
}
152162

153163
func prepareWebhooks(repo *models.Repository, event models.HookEventType, p api.Payloader) error {

‎routers/api/v1/repo/hook.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ func TestHook(ctx *context.APIContext) {
137137
ctx.Error(500, "PrepareWebhook: ", err)
138138
return
139139
}
140-
go webhook.HookQueue.Add(ctx.Repo.Repository.ID)
140+
141141
ctx.Status(204)
142142
}
143143

‎routers/repo/pull.go

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ import (
2323
"code.gitea.io/gitea/modules/notification"
2424
"code.gitea.io/gitea/modules/setting"
2525
"code.gitea.io/gitea/modules/util"
26-
"code.gitea.io/gitea/modules/webhook"
2726
"code.gitea.io/gitea/services/gitdiff"
2827
pull_service "code.gitea.io/gitea/services/pull"
2928
repo_service "code.gitea.io/gitea/services/repository"
@@ -824,7 +823,6 @@ func TriggerTask(ctx *context.Context) {
824823

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

827-
go webhook.HookQueue.Add(repo.ID)
828826
go pull_service.AddTestPullRequestTask(pusher, repo.ID, branch, true)
829827
ctx.Status(202)
830828
}

‎routers/repo/webhook.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -869,7 +869,6 @@ func TestWebhook(ctx *context.Context) {
869869
ctx.Flash.Error("PrepareWebhook: " + err.Error())
870870
ctx.Status(500)
871871
} else {
872-
go webhook.HookQueue.Add(ctx.Repo.Repository.ID)
873872
ctx.Flash.Info(ctx.Tr("repo.settings.webhook.test_delivery_success"))
874873
ctx.Status(200)
875874
}

‎services/milestone/milestone.go

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,6 @@ func ChangeMilestoneAssign(issue *models.Issue, doer *models.User, oldMilestoneI
5353
}
5454
if err != nil {
5555
log.Error("PrepareWebhooks [is_pull: %v]: %v", issue.IsPull, err)
56-
} else {
57-
go webhook.HookQueue.Add(issue.RepoID)
5856
}
5957
return nil
6058
}

‎services/mirror/sync.go

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,6 @@ func syncAction(opType models.ActionType, repo *models.Repository, refName strin
2828
return fmt.Errorf("notifyWatchers: %v", err)
2929
}
3030

31-
defer func() {
32-
go webhook.HookQueue.Add(repo.ID)
33-
}()
34-
3531
return nil
3632
}
3733

‎services/pull/merge.go

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -369,8 +369,6 @@ func Merge(pr *models.PullRequest, doer *models.User, baseGitRepo *git.Repositor
369369
Sender: doer.APIFormat(),
370370
}); err != nil {
371371
log.Error("PrepareWebhooks: %v", err)
372-
} else {
373-
go webhook.HookQueue.Add(pr.Issue.Repo.ID)
374372
}
375373

376374
return nil

‎services/pull/pull.go

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,6 @@ func NewPullRequest(repo *models.Repository, pull *models.Issue, labelIDs []int6
5050
Sender: pull.Poster.APIFormat(),
5151
}); err != nil {
5252
log.Error("PrepareWebhooks: %v", err)
53-
} else {
54-
go webhook.HookQueue.Add(repo.ID)
5553
}
5654

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

‎services/pull/review.go

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ func reviewHook(review *models.Review) error {
5656
if err != nil {
5757
return err
5858
}
59-
if err := webhook.PrepareWebhooks(review.Issue.Repo, reviewHookType, &api.PullRequestPayload{
59+
return webhook.PrepareWebhooks(review.Issue.Repo, reviewHookType, &api.PullRequestPayload{
6060
Action: api.HookIssueSynchronized,
6161
Index: review.Issue.Index,
6262
PullRequest: pr.APIFormat(),
@@ -66,10 +66,5 @@ func reviewHook(review *models.Review) error {
6666
Type: string(reviewHookType),
6767
Content: review.Content,
6868
},
69-
}); err != nil {
70-
return err
71-
}
72-
go webhook.HookQueue.Add(review.Issue.Repo.ID)
73-
74-
return nil
69+
})
7570
}

‎services/release/release.go

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -92,8 +92,6 @@ func CreateRelease(gitRepo *git.Repository, rel *models.Release, attachmentUUIDs
9292
Sender: rel.Publisher.APIFormat(),
9393
}); err != nil {
9494
log.Error("PrepareWebhooks: %v", err)
95-
} else {
96-
go webhook.HookQueue.Add(rel.Repo.ID)
9795
}
9896
}
9997
}
@@ -129,8 +127,6 @@ func UpdateRelease(doer *models.User, gitRepo *git.Repository, rel *models.Relea
129127
Sender: doer.APIFormat(),
130128
}); err1 != nil {
131129
log.Error("PrepareWebhooks: %v", err)
132-
} else {
133-
go webhook.HookQueue.Add(rel.Repo.ID)
134130
}
135131

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

202196
return nil

0 commit comments

Comments
 (0)