From 63d5de9d928fd568c9e72c82c0bc6a39e44403d5 Mon Sep 17 00:00:00 2001 From: David Svantesson Date: Tue, 30 Jul 2019 12:26:05 +0200 Subject: [PATCH 1/3] Move add to hook queue for created repo to outside xorm session. Signed-off-by: David Svantesson --- models/repo.go | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/models/repo.go b/models/repo.go index 501a2c91207f5..bd8a64c6e8660 100644 --- a/models/repo.go +++ b/models/repo.go @@ -1332,7 +1332,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) @@ -1402,7 +1401,14 @@ func CreateRepository(doer, u *User, opts CreateRepoOptions) (_ *Repository, err } } - return repo, sess.Commit() + err = sess.Commit() + + // 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 { @@ -2462,6 +2468,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) } From 29fd11c7a72b0203c20fb9ed0fcc974baaf33bc2 Mon Sep 17 00:00:00 2001 From: David Svantesson Date: Tue, 30 Jul 2019 15:01:32 +0200 Subject: [PATCH 2/3] CreateRepository: Error handling if session commit fails. Signed-off-by: David Svantesson --- models/repo.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/models/repo.go b/models/repo.go index bd8a64c6e8660..2756926ff2970 100644 --- a/models/repo.go +++ b/models/repo.go @@ -1402,6 +1402,9 @@ func CreateRepository(doer, u *User, opts CreateRepoOptions) (_ *Repository, err } err = sess.Commit() + if err != nil { + return nil, err + } // Add to hook queue for created repo after session commit. if u.IsOrganization() { From e7013ca765f70234db93710d27995765766ab1b7 Mon Sep 17 00:00:00 2001 From: David Svantesson Date: Tue, 30 Jul 2019 17:50:30 +0200 Subject: [PATCH 3/3] If case on same row as statement. Signed-off-by: David Svantesson --- models/repo.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/models/repo.go b/models/repo.go index 2756926ff2970..fe296c1a11a6f 100644 --- a/models/repo.go +++ b/models/repo.go @@ -1401,8 +1401,7 @@ func CreateRepository(doer, u *User, opts CreateRepoOptions) (_ *Repository, err } } - err = sess.Commit() - if err != nil { + if err = sess.Commit(); err != nil { return nil, err }