Merge pull request #658 from mheon/lock_to_interface

Replace sync.Mutex with sync.Locker to allow different locks
This commit is contained in:
Antonio Murdaca 2017-07-15 10:48:12 +02:00 committed by GitHub
commit 73c5285260
2 changed files with 4 additions and 2 deletions

View file

@ -57,7 +57,7 @@ type Server struct {
store sstorage.Store
storageImageServer storage.ImageServer
storageRuntimeServer storage.RuntimeServer
stateLock sync.Mutex
stateLock sync.Locker
updateLock sync.RWMutex
state *serverState
netPlugin ocicni.CNIPlugin
@ -589,6 +589,7 @@ func New(config *Config) (*Server, error) {
store: store,
storageImageServer: imageService,
storageRuntimeServer: storageRuntimeService,
stateLock: new(sync.Mutex),
netPlugin: netPlugin,
hostportManager: hostportManager,
config: *config,