Logging refactoring, no centralized humanizer

[nncp.git] / src / ctx.go

diff --git a/src/ctx.go b/src/ctx.go
index d83882800180f176b6fcf03ee632aba00a427ef8..88fd852ecb17f1d6fdec67f199c6674e790d34d5 100644 (file)
--- a/src/ctx.go
+++ b/src/ctx.go
@@ -19,6 +19,7 @@ package nncp
 
 import (
        "errors"
+       "fmt"
        "io/ioutil"
        "log"
        "os"
@@ -65,13 +66,16 @@ func (ctx *Ctx) FindNode(id string) (*Node, error) {
 
 func (ctx *Ctx) ensureRxDir(nodeId *NodeId) error {
        dirPath := filepath.Join(ctx.Spool, nodeId.String(), string(TRx))
+       logMsg := func(les LEs) string {
+               return fmt.Sprintf("Ensuring directory %s existence", dirPath)
+       }
        if err := os.MkdirAll(dirPath, os.FileMode(0777)); err != nil {
-               ctx.LogE("dir-ensure", LEs{{"Dir", dirPath}}, err, "")
+               ctx.LogE("dir-ensure-mkdir", LEs{{"Dir", dirPath}}, err, logMsg)
                return err
        }
        fd, err := os.Open(dirPath)
        if err != nil {
-               ctx.LogE("dir-ensure", LEs{{"Dir", dirPath}}, err, "")
+               ctx.LogE("dir-ensure-open", LEs{{"Dir", dirPath}}, err, logMsg)
                return err
        }
        return fd.Close()