Logging refactoring, no centralized humanizer

[nncp.git] / src / check.go

diff --git a/src/check.go b/src/check.go
index 2569e6af15c360d334e7e650d00cfacdae7679f1..a8a32e2c7899bcb68c4c0f6b23394f72312c2aac 100644 (file)
--- a/src/check.go
+++ b/src/check.go
@@ -21,6 +21,7 @@ import (
        "bufio"
        "bytes"
        "errors"
+       "fmt"
        "io"
        "log"
        "os"
@@ -45,26 +46,30 @@ func Check(src io.Reader, checksum []byte, les LEs, showPrgrs bool) (bool, error
 func (ctx *Ctx) checkXxIsBad(nodeId *NodeId, xx TRxTx) bool {
        isBad := false
        for job := range ctx.Jobs(nodeId, xx) {
+               pktName := Base32Codec.EncodeToString(job.HshValue[:])
                les := LEs{
                        {"XX", string(xx)},
                        {"Node", nodeId},
-                       {"Pkt", Base32Codec.EncodeToString(job.HshValue[:])},
+                       {"Pkt", pktName},
                        {"FullSize", job.Size},
                }
+               logMsg := func(les LEs) string {
+                       return fmt.Sprintf("Checking: %s/%s/%s", nodeId, string(xx), pktName)
+               }
                fd, err := os.Open(job.Path)
                if err != nil {
-                       ctx.LogE("check", les, err, "")
+                       ctx.LogE("checking", les, err, logMsg)
                        return true
                }
                gut, err := Check(fd, job.HshValue[:], les, ctx.ShowPrgrs)
                fd.Close() // #nosec G104
                if err != nil {
-                       ctx.LogE("check", les, err, "")
+                       ctx.LogE("checking", les, err, logMsg)
                        return true
                }
                if !gut {
                        isBad = true
-                       ctx.LogE("check", les, errors.New("bad"), "")
+                       ctx.LogE("checking", les, errors.New("bad"), logMsg)
                }
        }
        return isBad
@@ -82,6 +87,7 @@ func (ctx *Ctx) CheckNoCK(nodeId *NodeId, hshValue *[32]byte) (int64, error) {
        if err != nil {
                return 0, err
        }
+       defer fd.Close()
        fi, err := fd.Stat()
        if err != nil {
                return 0, err
@@ -101,5 +107,18 @@ func (ctx *Ctx) CheckNoCK(nodeId *NodeId, hshValue *[32]byte) (int64, error) {
        if err = os.Rename(pktPath+NoCKSuffix, pktPath); err != nil {
                return 0, err
        }
-       return size, DirSync(dirToSync)
+       if err = DirSync(dirToSync); err != nil {
+               return size, err
+       }
+       if ctx.HdrUsage {
+               if _, err = fd.Seek(0, io.SeekStart); err != nil {
+                       return size, err
+               }
+               _, pktEncRaw, err := ctx.HdrRead(fd)
+               if err != nil {
+                       return size, err
+               }
+               ctx.HdrWrite(pktEncRaw, pktPath)
+       }
+       return size, err
 }