Commit cffd35e5 authored by Geoff Simmons's avatar Geoff Simmons

Fix the scope of the lock in pem.Files.Write().

parent 9640989e
......@@ -345,6 +345,9 @@ func (pemfiles *Files) Write(
//
// Delete is protected by a write lock.
func (pemfiles *Files) Delete(namespace, name string) (bool, error) {
pemfiles.mtx.Lock()
defer pemfiles.mtx.Unlock()
key := namespace + "/" + name
pem, exists := pemfiles.Files[key]
if !exists {
......@@ -352,9 +355,6 @@ func (pemfiles *Files) Delete(namespace, name string) (bool, error) {
}
path := pemfiles.Path(pem)
pemfiles.mtx.Lock()
defer pemfiles.mtx.Unlock()
if err := os.Remove(path); err != nil {
return !os.IsNotExist(err), err
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment