X-Git-Url: http://www.git.cypherpunks.ru/?a=blobdiff_plain;f=src%2Flockdir.go;h=1e4e39498fb50e9bdba3e83b128eff2eb73fb576;hb=cf9363f956cb2d93a581c11ed65c5b02910d10d5;hp=32f9f6465efd9e3fe04f35452a3014f91392b9bb;hpb=dd887c15fa21071a2f4931f7248e10c4ab1029d2;p=nncp.git

diff --git a/src/lockdir.go b/src/lockdir.go
index 32f9f64..1e4e394 100644
--- 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-2019 Sergey Matveev <stargrave@stargrave.org>
+Copyright (C) 2016-2023 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": 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": err}, "")
+		ctx.LogE("lockdir-flock", LEs{{"Path", lockPath}}, err, func(les LEs) string {
+			return "Locking directory: locking " + lockPath
+		})
 		dirLock.Close()
 		return nil, err
 	}