X-Git-Url: http://www.git.cypherpunks.ru/?a=blobdiff_plain;f=src%2Flockdir.go;h=a756381bee0f5d353d602112c75080cef0704694;hb=655146e4ee2bde72c9e8daa1361010fefe016df9;hp=2219d1bcfcd61643ada18a0df56557690d446990;hpb=5a9bf58a2638e42f2d42fa4d43c363a664fe8198;p=nncp.git diff --git a/src/lockdir.go b/src/lockdir.go index 2219d1b..a756381 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-2021 Sergey Matveev +Copyright (C) 2016-2022 Sergey Matveev 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 @@ -36,16 +36,16 @@ func (ctx *Ctx) LockDir(nodeId *NodeId, lockCtx string) (*os.File, error) { ) if err != nil { ctx.LogE("lockdir-open", LEs{{"Path", lockPath}}, err, func(les LEs) string { - return "Locking directory: opening %s" + lockPath + 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-flock", LEs{{"Path", lockPath}}, err, func(les LEs) string { - return "Locking directory: locking %s" + lockPath + return "Locking directory: locking " + lockPath }) - dirLock.Close() // #nosec G104 + dirLock.Close() return nil, err } return dirLock, nil @@ -53,7 +53,7 @@ func (ctx *Ctx) LockDir(nodeId *NodeId, lockCtx string) (*os.File, error) { func (ctx *Ctx) UnlockDir(fd *os.File) { if fd != nil { - unix.Flock(int(fd.Fd()), unix.LOCK_UN) // #nosec G104 - fd.Close() // #nosec G104 + unix.Flock(int(fd.Fd()), unix.LOCK_UN) + fd.Close() } }