Logging refactoring, no centralized humanizer

[nncp.git] / src / tmp.go

diff --git a/src/tmp.go b/src/tmp.go
index b99ef3d49a9a4d36bc6d1b39c310d50bf9d01722..d3c833e996b459e65d42e16220f872b94e68a388 100644 (file)
--- a/src/tmp.go
+++ b/src/tmp.go
@@ -19,6 +19,7 @@ package nncp
 
 import (
        "bufio"
+       "fmt"
        "hash"
        "io"
        "os"
@@ -44,7 +45,9 @@ func (ctx *Ctx) NewTmpFile() (*os.File, error) {
        }
        fd, err := TempFile(jobsPath, "")
        if err == nil {
-               ctx.LogD("tmp", LEs{{"Src", fd.Name()}}, "created")
+               ctx.LogD("tmp", LEs{{"Src", fd.Name()}}, func(les LEs) string {
+                       return "Temporary file created: %s" + fd.Name()
+               })
        }
        return fd, err
 }
@@ -113,7 +116,13 @@ func (tmp *TmpFileWHash) Commit(dir string) error {
                return err
        }
        checksum := tmp.Checksum()
-       tmp.ctx.LogD("tmp", LEs{{"Src", tmp.Fd.Name()}, {"Dst", checksum}}, "commit")
+       tmp.ctx.LogD(
+               "tmp-rename",
+               LEs{{"Src", tmp.Fd.Name()}, {"Dst", checksum}},
+               func(les LEs) string {
+                       return fmt.Sprintf("Temporary file: %s -> %s", tmp.Fd.Name(), checksum)
+               },
+       )
        if err = os.Rename(tmp.Fd.Name(), filepath.Join(dir, checksum)); err != nil {
                return err
        }