Commite29a179

committed

Unlock in defer

1 parent5562335 commite29a179Copy full SHA for e29a179

File tree

-8

lines changed

-8

lines changed

Lines changed: 1 addition & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -102,31 +102,28 @@ func (c *RepoAccessCache) GetRepoAccessInfo(ctx context.Context, username, owner`
`102`	`102`	`key:=cacheKey(owner,repo)`
`103`	`103`	`userKey:=strings.ToLower(username)`
`104`	`104`	`c.mu.Lock()`
	`105`	`+deferc.mu.Unlock()`
`105`	`106`	`entry:=c.ensureEntry(key)`
`106`	`107`	`ifentry.ready {`
`107`	`108`	`ifcachedHasPush,known:=entry.knownUsers[userKey];known {`
`108`	`109`	`entry.scheduleExpiry(c,key)`
`109`	`110`	`c.logDebug("repo access cache hit","owner",owner,"repo",repo,"user",username)`
`110`	`111`	`cachedPrivate:=entry.isPrivate`
`111`		`-c.mu.Unlock()`
`112`	`112`	`returncachedPrivate,cachedHasPush,nil`
`113`	`113`	`}`
`114`	`114`	`}`
`115`		`-c.mu.Unlock()`
`116`	`115`	`c.logDebug("repo access cache miss","owner",owner,"repo",repo,"user",username)`
`117`	`116`
`118`	`117`	`isPrivate,hasPush,err:=c.queryRepoAccessInfo(ctx,username,owner,repo)`
`119`	`118`	`iferr!=nil {`
`120`	`119`	`returnfalse,false,err`
`121`	`120`	`}`
`122`	`121`
`123`		`-c.mu.Lock()`
`124`	`122`	`entry=c.ensureEntry(key)`
`125`	`123`	`entry.ready=true`
`126`	`124`	`entry.isPrivate=isPrivate`
`127`	`125`	`entry.knownUsers[userKey]=hasPush`
`128`	`126`	`entry.scheduleExpiry(c,key)`
`129`		`-c.mu.Unlock()`
`130`	`127`
`131`	`128`	`returnisPrivate,hasPush,nil`
`132`	`129`	`}`

Lines changed: 3 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -98,10 +98,9 @@ func requireAccess(ctx context.Context, t testing.T, cache RepoAccessCache) {`
`98`	`98`
`99`	`99`	`funcTestRepoAccessCacheEvictsAfterTTL(t*testing.T) {`
`100`	`100`	`t.Parallel()`
	`101`	`+ctx:=t.Context()`
`101`	`102`
`102`	`103`	`cache,transport:=newMockRepoAccessCache(t,5*time.Millisecond)`
`103`		`-ctx:=context.Background()`
`104`		`-`
`105`	`104`	`requireAccess(ctx,t,cache)`
`106`	`105`	`requireAccess(ctx,t,cache)`
`107`	`106`	`require.EqualValues(t,1,transport.CallCount())`
`@@ -113,10 +112,10 @@ func TestRepoAccessCacheEvictsAfterTTL(t *testing.T) {`
`113`	`112`	`}`
`114`	`113`
`115`	`114`	`funcTestRepoAccessCacheTTLDisabled(t*testing.T) {`
	`115`	`+ctx:=t.Context()`
`116`	`116`	`t.Parallel()`
`117`	`117`
`118`	`118`	`cache,transport:=newMockRepoAccessCache(t,0)`
`119`		`-ctx:=context.Background()`
`120`	`119`
`121`	`120`	`requireAccess(ctx,t,cache)`
`122`	`121`	`requireAccess(ctx,t,cache)`
`@@ -129,10 +128,10 @@ func TestRepoAccessCacheTTLDisabled(t *testing.T) {`
`129`	`128`	`}`
`130`	`129`
`131`	`130`	`funcTestRepoAccessCacheSetTTLReschedulesExistingEntry(t*testing.T) {`
	`131`	`+ctx:=t.Context()`
`132`	`132`	`t.Parallel()`
`133`	`133`
`134`	`134`	`cache,transport:=newMockRepoAccessCache(t,0)`
`135`		`-ctx:=context.Background()`
`136`	`135`
`137`	`136`	`requireAccess(ctx,t,cache)`
`138`	`137`	`require.EqualValues(t,1,transport.CallCount())`

Comments

(0)