Moved starting of fuse

fuse.go

@@ -9,10 +9,18 @@ import (
 	"go.arsenm.dev/infinitime"
 )
 
-func startFuse(ctx context.Context, dev *infinitime.Device) error {
+func startFUSE(ctx context.Context, dev *infinitime.Device) error {
 	// This is where we'll mount the FS
 	os.Mkdir(k.String("fuse.mountpoint"), 0755)
-	root := fusefs.BuildRootNode(dev)
+	root, err := fusefs.BuildRootNode(dev)
+	if err != nil {
+		log.Error("Building root node failed").
+			Err(err).
+			Send()
+			return err
+		return err
+	}
+
 	server, err := fs.Mount(k.String("fuse.mountpoint"), root, &fs.Options{
 		MountOptions: fuse.MountOptions{
 			// Set to true to see how the file system works.

internal/fusefs/fuse.go

@@ -36,11 +36,19 @@ type ITNode struct {
 	path string
 }
 
-func BuildRootNode(dev *infinitime.Device) *ITNode {
-	inodemap = make(map[string]uint64)
-	myfs, _ = dev.FS()
+var myfs *blefs.FS = nil
+var inodemap map[string]uint64 = nil
 
-	return &ITNode{kind: 0}
+func BuildRootNode(dev *infinitime.Device) (*ITNode, error) {
+	var err error
+	inodemap = make(map[string]uint64)
+	myfs, err = dev.FS()
+	if err != nil {
+		log.Error("FUSE Failed to get filesystem").Err(err).Send()
+		return nil, err
+	}
+
+	return &ITNode{kind: 0}, nil
 }
 
 var properties = make([]ITProperty, 6)
@@ -80,11 +88,7 @@ func BuildProperties(dev *infinitime.Device) {
 }
 
 
-
-var myfs *blefs.FS = nil;
-var inodemap map[string]uint64 = nil;
-
-var _ = (fs.NodeReaddirer)((*ITNode)(nil))
+var _ fs.NodeReaddirer = (*ITNode)(nil)
 
 // Readdir is part of the NodeReaddirer interface
 func (n *ITNode) Readdir(ctx context.Context) (fs.DirStream, syscall.Errno) {
@@ -119,12 +123,21 @@ func (n *ITNode) Readdir(ctx context.Context) (fs.DirStream, syscall.Errno) {
 
 	case 2:
 		// on device
-		files, _ := myfs.ReadDir(n.path)
-		log.Info("readdir").Str("path", n.path).Int("objects", len(files)).Send()
+		files, err := myfs.ReadDir(n.path)
+		if err != nil {
+			log.Error("FUSE ReadDir failed").Str("path", n.path).Err(err).Send()
+			return nil, syscall.ENOENT
+		}
+
+		log.Debug("FUSE ReadDir succeeded").Str("path", n.path).Int("objects", len(files)).Send()
 		r := make([]fuse.DirEntry, len(files))
 		n.lst = make([]DirEntry, len(files))
 		for ind, entry := range files {
-			info, _ := entry.Info()
+			info, err := entry.Info()
+			if err != nil {
+				log.Error("FUSE Info failed").Str("path", n.path).Err(err).Send()
+				return nil, syscall.ENOENT
+			}
 			name := info.Name()
 
 			file := DirEntry{
@@ -161,7 +174,7 @@ func (n *ITNode) Readdir(ctx context.Context) (fs.DirStream, syscall.Errno) {
 	return fs.NewListDirStream(r), 0
 }
 
-var _ = (fs.NodeLookuper)((*ITNode)(nil))
+var _ fs.NodeLookuper = (*ITNode)(nil)
 func (n *ITNode) Lookup(ctx context.Context, name string, out *fuse.EntryOut) (*fs.Inode, syscall.Errno) {
 	switch n.kind {
 	case 0:
@@ -206,9 +219,9 @@ func (n *ITNode) Lookup(ctx context.Context, name string, out *fuse.EntryOut) (*
 
 		for _, file := range n.lst {
 			if file.path != n.path + "/" + name {
-				continue;
+				continue
 			}
-			log.Info("LookUp successful").Str("path", file.path).Send()
+			log.Debug("FUSE Lookup successful").Str("path", file.path).Send()
 
 			if file.isDir {
 				stable := fs.StableAttr{
@@ -230,9 +243,9 @@ func (n *ITNode) Lookup(ctx context.Context, name string, out *fuse.EntryOut) (*
 				child := n.NewInode(ctx, operations, stable)
 				return child, 0
 			}
-			break;
+			break
 		}
-		log.Warn("LookUp failed").Str("path", n.path + "/" + name).Send()
+		log.Warn("FUSE Lookup failed").Str("path", n.path + "/" + name).Send()
 	}
 	return nil, syscall.ENOENT
 }
@@ -240,10 +253,10 @@ func (n *ITNode) Lookup(ctx context.Context, name string, out *fuse.EntryOut) (*
 type bytesFileReadHandle struct {
 	content []byte
 }
-var _ = (fs.FileReader)((*bytesFileReadHandle)(nil))
 
+var _ fs.FileReader = (*bytesFileReadHandle)(nil)
 func (fh *bytesFileReadHandle) Read(ctx context.Context, dest []byte, off int64) (fuse.ReadResult, syscall.Errno) {
-	log.Info("Executing Read").Int("size", len(fh.content)).Send()
+	log.Debug("FUSE Executing Read").Int("size", len(fh.content)).Send()
 	end := off + int64(len(dest))
 	if end > int64(len(fh.content)) {
 		end = int64(len(fh.content))
@@ -255,13 +268,13 @@ type sensorFileReadHandle struct {
 	ch <-chan []byte
 	cancel context.CancelFunc
 }
-var _ = (fs.FileReader)((*sensorFileReadHandle)(nil))
+var _ fs.FileReader = (*sensorFileReadHandle)(nil)
 func (fh *sensorFileReadHandle) Read(ctx context.Context, dest []byte, off int64) (fuse.ReadResult, syscall.Errno) {
 	content := <-fh.ch
 	return fuse.ReadResultData(content), 0
 }
 
-var _ = (fs.FileFlusher)((*sensorFileReadHandle)(nil))
+var _ fs.FileFlusher = (*sensorFileReadHandle)(nil)
 func (fh *sensorFileReadHandle) Flush(ctx context.Context) (errno syscall.Errno) {
 	fh.cancel()
 	return 0
@@ -273,7 +286,7 @@ type bytesFileWriteHandle struct {
 	path string
 }
 
-var _ = (fs.FileWriter)((*bytesFileWriteHandle)(nil))
+var _ fs.FileWriter = (*bytesFileWriteHandle)(nil)
 func (fh *bytesFileWriteHandle) Write(ctx context.Context, data []byte, off int64) (written uint32, errno syscall.Errno) {
 	log.Info("Executing Write").Str("path", fh.path).Int("prev_size", len(fh.content)).Int("next_size", len(data)).Send()
 	if off != int64(len(fh.content)) {
@@ -282,55 +295,55 @@ func (fh *bytesFileWriteHandle) Write(ctx context.Context, data []byte, off int6
 	return uint32(len(data)), 0
 }
 
-var _ = (fs.FileFlusher)((*bytesFileWriteHandle)(nil))
+var _ fs.FileFlusher = (*bytesFileWriteHandle)(nil)
 func (fh *bytesFileWriteHandle) Flush(ctx context.Context) (errno syscall.Errno) {
 	if len(fh.content) == 0 {
 		return 0
 	}
 
-	log.Info("Attempting flush").Str("path", fh.path).Send()
+	log.Debug("FUSE Attempting flush").Str("path", fh.path).Send()
 	fp, err := myfs.Create(fh.path, uint32(len(fh.content)))
 	if err != nil {
-		log.Error("Flush failed: create").Str("path", fh.path).Err(err).Send()
+		log.Error("FUSE Flush failed: create").Str("path", fh.path).Err(err).Send()
 		return syscall.EROFS
 	}
 
 	go func() {
 		// For every progress event
 		for sent := range fp.Progress() {
-			log.Info("Progress").Int("bytes", int(sent)).Int("of", len(fh.content)).Send();
+			log.Debug("FUSE Flush progress").Int("bytes", int(sent)).Int("total", len(fh.content)).Send()
 		}
 	}()
 
 	r := bytes.NewReader(fh.content)
 	nread, err := io.Copy(fp, r)
 	if err != nil {
-		log.Error("Flush failed: write").Str("path", fh.path).Err(err).Send()
+		log.Error("FUSE Flush failed during write").Str("path", fh.path).Err(err).Send()
 		fp.Close()
 		return syscall.EROFS
 	}
 	if int(nread) != len(fh.content) {
-		log.Error("Flush failed: write").Str("path", fh.path).Int("expect", len(fh.content)).Int("got", int(nread)).Send()
+		log.Error("FUSE Flush failed during write").Str("path", fh.path).Int("expect", len(fh.content)).Int("got", int(nread)).Send()
 		fp.Close()
 		return syscall.EROFS
 	}
 	err = fp.Close()
 	if err != nil {
-		log.Error("Flush failed: close").Str("path", fh.path).Err(err).Send()
+		log.Error("FUSE Flush failed during close").Str("path", fh.path).Err(err).Send()
 		return syscall.EROFS
 	}
-	log.Info("Flush done").Str("path", fh.path).Int("size", len(fh.content)).Send()
+	log.Debug("FUSE Flush done").Str("path", fh.path).Int("size", len(fh.content)).Send()
 
 	return 0
 }
-var _ = (fs.FileFsyncer)((*bytesFileWriteHandle)(nil))
+var _ fs.FileFsyncer = (*bytesFileWriteHandle)(nil)
 func (fh *bytesFileWriteHandle) Fsync(ctx context.Context, flags uint32) (errno syscall.Errno) {
 	return fh.Flush(ctx)
 }
 
-var _ = (fs.NodeGetattrer)((*ITNode)(nil))
+var _ fs.NodeGetattrer = (*ITNode)(nil)
 func (bn *ITNode) Getattr(ctx context.Context, f fs.FileHandle, out *fuse.AttrOut) syscall.Errno {
-	log.Info("getattr").Str("path", bn.path).Send();
+	log.Debug("FUSE getattr").Str("path", bn.path).Send()
 	out.Ino = bn.Ino
 	out.Mtime = bn.self.modtime
 	out.Ctime = bn.self.modtime
@@ -339,36 +352,36 @@ func (bn *ITNode) Getattr(ctx context.Context, f fs.FileHandle, out *fuse.AttrOu
 	return 0
 }
 
-var _ = (fs.NodeSetattrer)((*ITNode)(nil))
+var _ fs.NodeSetattrer = (*ITNode)(nil)
 func (bn *ITNode) Setattr(ctx context.Context, fh fs.FileHandle, in *fuse.SetAttrIn, out *fuse.AttrOut) syscall.Errno {
-	log.Info("setattr").Str("path", bn.path).Send()
-	out.Size = 0;
-	out.Mtime = 0;
+	log.Debug("FUSE setattr").Str("path", bn.path).Send()
+	out.Size = 0
+	out.Mtime = 0
 	return 0
 }
 
-var _ = (fs.NodeOpener)((*ITNode)(nil))
+var _ fs.NodeOpener = (*ITNode)(nil)
 func (f *ITNode) Open(ctx context.Context, openFlags uint32) (fh fs.FileHandle, fuseFlags uint32, errno syscall.Errno) {
 	switch f.kind {
 	case 2:
 		// FS file
 		if openFlags&syscall.O_RDWR != 0 {
-			log.Warn("open: failed RDWR").Str("path", f.path).Send()
+			log.Error("FUSE Open failed: RDWR").Str("path", f.path).Send()
 			return nil, 0, syscall.EROFS
 		}
 
 		if openFlags & syscall.O_WRONLY != 0 {
-			log.Info("Opening file: write").Str("path", f.path).Send()
+			log.Debug("FUSE Opening for write").Str("path", f.path).Send()
 			fh = &bytesFileWriteHandle{
 				path : f.path,
 				content : make([]byte, 0),
 			}
 			return fh, fuse.FOPEN_DIRECT_IO, 0
 		} else {
-			log.Info("Opening file: read").Str("path", f.path).Send();
+			log.Debug("FUSE Opening for read").Str("path", f.path).Send()
 			fp, err := myfs.Open(f.path)
 			if err != nil {
-				log.Error("Opening file failed").Str("path", f.path).Err(err).Send();
+				log.Error("FUSE: Opening failed").Str("path", f.path).Err(err).Send()
 				return nil, 0, syscall.EROFS
 			}
 
@@ -379,13 +392,13 @@ func (f *ITNode) Open(ctx context.Context, openFlags uint32) (fh fs.FileHandle,
 			go func() {
 				// For every progress event
 				for sent := range fp.Progress() {
-					log.Info("Progress").Int("bytes", int(sent)).Int("of", int(f.self.size)).Send();
+					log.Debug("FUSE Read progress").Int("bytes", int(sent)).Int("total", int(f.self.size)).Send()
 				}
 			}()
 
 			_, err = io.Copy(b, fp)
 			if err != nil {
-				log.Error("Read failed").Str("path", f.path).Err(err).Send()
+				log.Error("FUSE Read failed").Str("path", f.path).Err(err).Send()
 				fp.Close()
 				return nil, 0, syscall.EROFS
 			}
@@ -423,7 +436,7 @@ func (f *ITNode) Open(ctx context.Context, openFlags uint32) (fh fs.FileHandle,
 	return nil, 0, syscall.EROFS
 }
 
-var _ = (fs.NodeCreater)((*ITNode)(nil))
+var _ fs.NodeCreater = (*ITNode)(nil)
 func (f *ITNode) Create(ctx context.Context, name string, flags uint32, mode uint32, out *fuse.EntryOut) (node *fs.Inode, fh fs.FileHandle, fuseFlags uint32, errno syscall.Errno) {
 	if f.kind != 2 {
 		return nil, nil, 0, syscall.EROFS
@@ -448,13 +461,13 @@ func (f *ITNode) Create(ctx context.Context, name string, flags uint32, mode uin
 		content : make([]byte, 0),
 	}
 
-	log.Info("Creating file").Str("path", path).Send()
+	log.Debug("FUSE Creating file").Str("path", path).Send()
 
 	errno = 0
 	return node, fh, fuseFlags, 0
 }
 
-var _ = (fs.NodeMkdirer)((*ITNode)(nil))
+var _ fs.NodeMkdirer = (*ITNode)(nil)
 func (f *ITNode) Mkdir(ctx context.Context, name string, mode uint32, out *fuse.EntryOut) (*fs.Inode, syscall.Errno) {
 	if f.kind != 2 {
 		return nil, syscall.EROFS
@@ -463,7 +476,7 @@ func (f *ITNode) Mkdir(ctx context.Context, name string, mode uint32, out *fuse.
 	path := f.path + "/" + name
 	err := myfs.Mkdir(path)
 	if err != nil {
-		log.Info("Mkdir failed").
+		log.Error("FUSE Mkdir failed").
 			Str("path", path).
 			Err(err).
 			Send()
@@ -483,21 +496,21 @@ func (f *ITNode) Mkdir(ctx context.Context, name string, mode uint32, out *fuse.
 	}
 	node := f.NewInode(ctx, operations, stable)
 
-	log.Info("Mkdir sucess").
+	log.Debug("FUSE Mkdir success").
 		Str("path", path).
 		Int("ino", int(ino)).
 		Send()
 	return node, 0
 }
 
-var _ = (fs.NodeRenamer)((*ITNode)(nil))
+var _ fs.NodeRenamer = (*ITNode)(nil)
 func (f *ITNode) Rename(ctx context.Context, name string, newParent fs.InodeEmbedder, newName string, flags uint32) syscall.Errno {
 	p1 := f.path + "/" + name
 	p2 := newParent.EmbeddedInode().Path(nil)[2:] + "/" + newName
 
 	err := myfs.Rename(p1, p2)
 	if err != nil {
-		log.Error("Rename failed").
+		log.Error("FUSE Rename failed").
 			Str("src", p1).
 			Str("dest", p2).
 			Err(err).
@@ -505,7 +518,7 @@ func (f *ITNode) Rename(ctx context.Context, name string, newParent fs.InodeEmbe
 
 		return syscall.EROFS
 	}
-	log.Info("Rename sucess").
+	log.Debug("FUSE Rename sucess").
 		Str("src", p1).
 		Str("dest", p2).
 		Send()
@@ -517,12 +530,12 @@ func (f *ITNode) Rename(ctx context.Context, name string, newParent fs.InodeEmbe
 	return 0
 }
 
-var _ = (fs.NodeUnlinker)((*ITNode)(nil))
+var _ fs.NodeUnlinker = (*ITNode)(nil)
 func (f *ITNode) Unlink(ctx context.Context, name string) syscall.Errno {
 	delete(inodemap, f.path + "/" + name)
 	err := myfs.Remove(f.path + "/" + name)
 	if err != nil {
-		log.Error("Unlink failed").
+		log.Error("FUSE Unlink failed").
 			Str("file", f.path + "/" + name).
 			Err(err).
 			Send()
@@ -530,13 +543,13 @@ func (f *ITNode) Unlink(ctx context.Context, name string) syscall.Errno {
 		return syscall.EROFS
 	}
 
-	log.Info("Unlink success").
+	log.Debug("FUSE Unlink success").
 		Str("file", f.path + "/" + name).
 		Send()
 	return 0
 }
 
-var _ = (fs.NodeRmdirer)((*ITNode)(nil))
+var _ fs.NodeRmdirer = (*ITNode)(nil)
 func (f *ITNode) Rmdir(ctx context.Context, name string) syscall.Errno {
 	return f.Unlink(ctx, name)
 }

main.go

@@ -181,18 +181,19 @@ func main() {
 		log.Error("Error intializing puremaps integration").Err(err).Send()
 	}
 
+	// Start fuse socket
+	if k.Bool("fuse.enabled") {
+		err = startFUSE(ctx, dev)
+		if err != nil {
+			log.Error("Error starting fuse socket").Err(err).Send()
+		}
+	}
+
 	// Start control socket
 	err = startSocket(ctx, dev)
 	if err != nil {
 		log.Error("Error starting socket").Err(err).Send()
 	}
-	// Start fuse socket
-	if k.Bool("fuse.enabled") {
-		err = startFuse(ctx, dev)
-		if err != nil {
-			log.Error("Error starting fuse socket").Err(err).Send()
-		}
-	}
 	// Block forever
 	select {}
 }