Raise copyright years

[nncp.git] / src / lockdir.go

diff --git a/src/lockdir.go b/src/lockdir.go
index d26f85f706eceb4913392cad17ff285cf1dd8d00..a756381bee0f5d353d602112c75080cef0704694 100644 (file)
--- a/src/lockdir.go
+++ b/src/lockdir.go
@@ -1,6 +1,6 @@
 /*
 NNCP -- Node to Node copy, utilities for store-and-forward data exchange
-Copyright (C) 2016-2020 Sergey Matveev <stargrave@stargrave.org>
+Copyright (C) 2016-2022 Sergey Matveev <stargrave@stargrave.org>
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -24,21 +24,27 @@ import (
        "golang.org/x/sys/unix"
 )
 
-func (ctx *Ctx) LockDir(nodeId *NodeId, xx TRxTx) (*os.File, error) {
-       ctx.ensureRxDir(nodeId)
-       lockPath := filepath.Join(ctx.Spool, nodeId.String(), string(xx)) + ".lock"
+func (ctx *Ctx) LockDir(nodeId *NodeId, lockCtx string) (*os.File, error) {
+       if err := ctx.ensureRxDir(nodeId); err != nil {
+               return nil, err
+       }
+       lockPath := filepath.Join(ctx.Spool, nodeId.String(), lockCtx) + ".lock"
        dirLock, err := os.OpenFile(
                lockPath,
                os.O_CREATE|os.O_WRONLY,
                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()
                return nil, err
        }