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(