Merge branch 'develop'

[nncp.git] / src / lockdir.go

diff --git a/src/lockdir.go b/src/lockdir.go
index 919d4cf3412e4f38f72e9fb5996386b53632e309..902ec22124b624c73c145b20463f0616cf3d1595 100644 (file)
--- a/src/lockdir.go
+++ b/src/lockdir.go
@@ -26,7 +26,6 @@ import (
 
 func (ctx *Ctx) LockDir(nodeId *NodeId, lockCtx string) (*os.File, error) {
        if err := ctx.ensureRxDir(nodeId); err != nil {
-               ctx.LogE("lockdir", SDS{}, err, "")
                return nil, err
        }
        lockPath := filepath.Join(ctx.Spool, nodeId.String(), lockCtx) + ".lock"
@@ -36,12 +35,16 @@ func (ctx *Ctx) LockDir(nodeId *NodeId, lockCtx string) (*os.File, error) {
                os.FileMode(0666),
        )
        if err != nil {
-               ctx.LogE("lockdir", SDS{"path": lockPath}, err, "")
+               ctx.LogE("lockdir-open", LEs{{"Path", lockPath}}, err, func(les LEs) string {
+                       return "Locking directory: opening " + lockPath
+               })
                return nil, err
        }
        err = unix.Flock(int(dirLock.Fd()), unix.LOCK_EX|unix.LOCK_NB)
        if err != nil {
-               ctx.LogE("lockdir", SDS{"path": lockPath}, err, "")
+               ctx.LogE("lockdir-flock", LEs{{"Path", lockPath}}, err, func(les LEs) string {
+                       return "Locking directory: locking " + lockPath
+               })
                dirLock.Close() // #nosec G104
                return nil, err
        }