Fixed sending to areas

[nncp.git] / src / ctx.go

diff --git a/src/ctx.go b/src/ctx.go
index 58dba44df6156381216ee90e5043587d9b538039..cfbe1b57d3b3e9dbfabcfa8a277d7f198cc9118e 100644 (file)
--- a/src/ctx.go
+++ b/src/ctx.go
@@ -69,21 +69,30 @@ func (ctx *Ctx) FindNode(id string) (*Node, error) {
        return node, nil
 }
 
-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)
+func ensureDir(dirs ...string) error {
+       p := filepath.Join(dirs...)
+       fi, err := os.Stat(p)
+       if err == nil {
+               if fi.IsDir() {
+                       return nil
+               }
+               return fmt.Errorf("%s: is not a directory", p)
        }
-       if err := os.MkdirAll(dirPath, os.FileMode(0777)); err != nil {
-               ctx.LogE("dir-ensure-mkdir", LEs{{"Dir", dirPath}}, err, logMsg)
+       if !os.IsNotExist(err) {
                return err
        }
-       fd, err := os.Open(dirPath)
+       return os.MkdirAll(p, os.FileMode(0777))
+}
+
+func (ctx *Ctx) ensureRxDir(nodeId *NodeId) error {
+       dirPath := filepath.Join(ctx.Spool, nodeId.String(), string(TRx))
+       err := ensureDir(dirPath)
        if err != nil {
-               ctx.LogE("dir-ensure-open", LEs{{"Dir", dirPath}}, err, logMsg)
-               return err
+               ctx.LogE("dir-ensure-mkdir", LEs{{"Dir", dirPath}}, err, func(les LEs) string {
+                       return fmt.Sprintf("Ensuring directory %s existence", dirPath)
+               })
        }
-       return fd.Close()
+       return err
 }
 
 func CtxFromCmdline(