From 93bac4e10dc7651b27ce87310857cd27c4d74bec Mon Sep 17 00:00:00 2001
From: David Svantesson <davidsvantesson@gmail.com>
Date: Wed, 31 Jul 2019 10:19:14 +0200
Subject: [PATCH] Backport of #7675. (#7682)
Move add to hook queue for created repo to outside xorm session.
Signed-off-by: David Svantesson <davidsvantesson@gmail.com>
---
models/repo.go | 17 +++++++++++++++--
1 file changed, 15 insertions(+), 2 deletions(-)
diff --git a/models/repo.go b/models/repo.go
index cae252f846..59c7559423 100644
--- a/models/repo.go
+++ b/models/repo.go
@@ -1324,7 +1324,6 @@ func createRepository(e *xorm.Session, doer, u *User, repo *Repository) (err err
}); err != nil {
return fmt.Errorf("prepareWebhooks: %v", err)
}
- go HookQueue.Add(repo.ID)
} else if err = repo.recalculateAccesses(e); err != nil {
// Organization automatically called this in addRepository method.
return fmt.Errorf("recalculateAccesses: %v", err)
@@ -1393,7 +1392,16 @@ func CreateRepository(doer, u *User, opts CreateRepoOptions) (_ *Repository, err
}
}
- return repo, sess.Commit()
+ if err = sess.Commit(); err != nil {
+ return nil, err
+ }
+
+ // Add to hook queue for created repo after session commit.
+ if u.IsOrganization() {
+ go HookQueue.Add(repo.ID)
+ }
+
+ return repo, err
}
func countRepositories(userID int64, private bool) int64 {
@@ -2478,6 +2486,11 @@ func ForkRepository(doer, u *User, oldRepo *Repository, name, desc string) (_ *R
go HookQueue.Add(oldRepo.ID)
}
+ // Add to hook queue for created repo after session commit.
+ if u.IsOrganization() {
+ go HookQueue.Add(repo.ID)
+ }
+
if err = repo.UpdateSize(); err != nil {
log.Error("Failed to update size for repository: %v", err)
}