From 2657eff11cf3d7bffd9f620baa291ec2823713c0 Mon Sep 17 00:00:00 2001 From: Ben Sarmiento Date: Sun, 12 Nov 2023 00:49:30 +0100 Subject: [PATCH] Remove useless functions and add mount default --- cmd/zurg/main.go | 10 ---------- internal/config/types.go | 5 ++++- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/cmd/zurg/main.go b/cmd/zurg/main.go index e904121..aa2be09 100644 --- a/cmd/zurg/main.go +++ b/cmd/zurg/main.go @@ -71,11 +71,6 @@ func main() { signal.Notify(shutdown, os.Interrupt, syscall.SIGTERM) go func() { - defer func() { - if r := recover(); r != nil { - log.Errorf("Server panic: %v\n", r) - } - }() log.Infof("Starting server on %s", addr) if err := server.ListenAndServe(); err != nil && err != http.ErrServerClosed { log.Panicf("Failed to start server: %v", err) @@ -84,11 +79,6 @@ func main() { // Start the mount in a goroutine with panic recovery. go func() { - defer func() { - if r := recover(); r != nil { - log.Errorf("Mount panic: %v\n", r) - } - }() log.Infof("Mounting on %s", mountPoint) if err := zfs.Mount(mountPoint, config, torrentMgr, chunkMgr); err != nil { log.Panicf("Failed to mount: %v", err) diff --git a/internal/config/types.go b/internal/config/types.go index 109554c..0cdc22a 100644 --- a/internal/config/types.go +++ b/internal/config/types.go @@ -64,12 +64,15 @@ func (z *ZurgConfig) GetOnLibraryUpdate() string { func (z *ZurgConfig) GetNetworkBufferSize() int { if z.NetworkBufferSize == 0 { - return 32 * 1024 + return 64 * 1024 // 64kb } return z.NetworkBufferSize } func (z *ZurgConfig) GetMountPoint() string { + if z.MountPoint == "" { + return "/mnt/zurg" + } return z.MountPoint }