luxolus/open-vault
2
0
Fork 0
Code Issues 1 Pull requests Releases Activity

Revert "Use mutexes directly, not pointers, in the token store mutex map"

Browse source 
This reverts commit 29f8d2ad75c2767e21b406d32c7a7a9dc6f9c3f2.
This commit is contained in:
Jeff Mitchell 2016-06-01 10:05:45 -04:00
parent 3472b65682
commit d2de61c650
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
vault/token_store.go
View file

@ -64,7 +64,7 @@ type TokenStore struct {
policyLookupFunc func(string) (*Policy, error)
tokenLocks map[string]sync.RWMutex
tokenLocks map[string]*sync.RWMutex
}
// NewTokenStore is used to construct a token store that is
@ -91,12 +91,12 @@ func NewTokenStore(c *Core, config *logical.BackendConfig) (*TokenStore, error)
}
t.salt = salt
t.tokenLocks = map[string]sync.RWMutex{}
t.tokenLocks = map[string]*sync.RWMutex{}
for i := int64(0); i < 256; i++ {
t.tokenLocks[fmt.Sprintf("%2x",
strconv.FormatInt(i, 16))] = sync.RWMutex{}
strconv.FormatInt(i, 16))] = &sync.RWMutex{}
}
t.tokenLocks["custom"] = sync.RWMutex{}
t.tokenLocks["custom"] = &sync.RWMutex{}
// Setup the framework endpoints
t.Backend = &framework.Backend{
@ -569,14 +569,14 @@ func (ts *TokenStore) storeCommon(entry *TokenEntry, writeSecondary bool) error
return nil
}
func (ts *TokenStore) getTokenLock(id string) sync.RWMutex {
func (ts *TokenStore) getTokenLock(id string) *sync.RWMutex {
// Find our multilevel lock, or fall back to global
var lock sync.RWMutex
var lock *sync.RWMutex
var ok bool
if len(id) >= 2 {
lock, ok = ts.tokenLocks[id[0:2]]
}
if !ok {
if !ok || lock == nil {
// Fall back for custom token IDs
lock = ts.tokenLocks["custom"]
}