Start to add zap logger everywhere

cmd/zurg/main.go

@@ -3,7 +3,6 @@ package main
 import (
 	"context"
 	"fmt"
-	"log"
 	"net/http"
 	"os"
 	"os/signal"
@@ -11,13 +10,17 @@ import (
 	"time"
 
 	"github.com/debridmediamanager.com/zurg/internal/config"
-	"github.com/debridmediamanager.com/zurg/internal/mount"
 	"github.com/debridmediamanager.com/zurg/internal/net"
 	"github.com/debridmediamanager.com/zurg/internal/torrent"
+	"github.com/debridmediamanager.com/zurg/internal/zfs"
+	"github.com/debridmediamanager.com/zurg/pkg/logutil"
 	"github.com/hashicorp/golang-lru/v2/expirable"
 )
 
 func main() {
+	rlog := logutil.NewLogger()
+	log := rlog.Named("main")
+
 	config, configErr := config.LoadZurgConfig("./config.yml")
 	if configErr != nil {
 		log.Panicf("Config failed to load: %v", configErr)
@@ -33,29 +36,52 @@ func main() {
 	addr := fmt.Sprintf(":%s", config.GetPort())
 	server := &http.Server{Addr: addr, Handler: mux}
 
+	mountPoint := config.GetMountPoint()
+	if _, err := os.Stat(mountPoint); os.IsNotExist(err) {
+		if err := os.Mkdir(mountPoint, 0755); err != nil {
+			log.Panicf("Failed to create mount point: %v", err)
+		}
+	}
+
 	shutdown := make(chan os.Signal, 1)
 	signal.Notify(shutdown, os.Interrupt, syscall.SIGTERM)
 
 	go func() {
-		log.Printf("Starting server on %s\n", addr)
+		defer func() {
+			if r := recover(); r != nil {
+				log.Errorf("Server panic: %v\n", r)
+			}
+		}()
+		log.Infof("Starting server on %s\n", addr)
 		if err := server.ListenAndServe(); err != nil && err != http.ErrServerClosed {
 			log.Panicf("Failed to start server: %v", err)
 		}
 	}()
 
-	// Start the mount in a goroutine.
+	// Start the mount in a goroutine with panic recovery.
 	go func() {
-		if err := mount.Mount(config.GetMountPath()); err != nil {
+		defer func() {
+			if r := recover(); r != nil {
+				log.Errorf("Mount panic: %v\n", r)
+			}
+		}()
+		log.Infof("Mounting on %s\n", mountPoint)
+		if err := zfs.Mount(mountPoint); err != nil {
 			log.Panicf("Failed to mount: %v", err)
 		}
 	}()
 
 	<-shutdown
-	log.Println("zurg signing off...")
 
-	ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
+	ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
 	defer cancel()
 
-	server.Shutdown(ctx)
+	if err := server.Shutdown(ctx); err != nil {
+		log.Errorf("Server shutdown error: %v\n", err)
+	}
+	if err := zfs.Unmount(mountPoint); err != nil {
+		log.Errorf("Unmount error: %v\n", err)
+	}
 
+	log.Info("Zurg signing off")
 }