Log unhandled errors if they occur

cmd/mutagen-agent/synchronizer.go

@@ -29,7 +29,7 @@ func housekeepRegularly(ctx context.Context, logger *logging.Logger) {
 	// Perform an initial housekeeping operation since the ticker won't fire
 	// straight away.
 	logger.Info("Performing initial housekeeping")
-	housekeeping.Housekeep()
+	housekeeping.Housekeep(logger)
 
 	// Create a ticker to regulate housekeeping and defer its shutdown.
 	ticker := time.NewTicker(housekeepingInterval)
@@ -42,7 +42,7 @@ func housekeepRegularly(ctx context.Context, logger *logging.Logger) {
 			return
 		case <-ticker.C:
 			logger.Info("Performing regular housekeeping")
-			housekeeping.Housekeep()
+			housekeeping.Housekeep(logger)
 		}
 	}
 }

cmd/mutagen/daemon/register.go

@@ -1,6 +1,9 @@
 package daemon
 
 import (
+	"os"
+
+	"github.com/mutagen-io/mutagen/pkg/logging"
 	"github.com/spf13/cobra"
 
 	"github.com/mutagen-io/mutagen/cmd"
@@ -10,7 +13,8 @@ import (
 
 // registerMain is the entry point for the register command.
 func registerMain(_ *cobra.Command, _ []string) error {
-	return daemon.Register()
+	logger := logging.NewLogger(logging.LevelError, os.Stderr)
+	return daemon.Register(logger)
 }
 
 // registerCommand is the register command.

cmd/mutagen/daemon/run.go

@@ -7,6 +7,7 @@ import (
 	"os"
 	"os/signal"
 
+	"github.com/mutagen-io/mutagen/pkg/must"
 	"github.com/spf13/cobra"
 
 	"google.golang.org/grpc"
@@ -27,18 +28,6 @@ import (
 
 // runMain is the entry point for the run command.
 func runMain(_ *cobra.Command, _ []string) error {
-	// Attempt to acquire the daemon lock and defer its release.
-	lock, err := daemon.AcquireLock()
-	if err != nil {
-		return fmt.Errorf("unable to acquire daemon lock: %w", err)
-	}
-	defer lock.Release()
-
-	// Create a channel to track termination signals. We do this before creating
-	// and starting other infrastructure so that we can ensure things terminate
-	// smoothly, not mid-initialization.
-	signalTermination := make(chan os.Signal, 1)
-	signal.Notify(signalTermination, cmd.TerminationSignals...)
 
 	// Create the root logger.
 	logLevel := logging.LevelInfo
@@ -51,6 +40,19 @@ func runMain(_ *cobra.Command, _ []string) error {
 	}
 	logger := logging.NewLogger(logLevel, os.Stderr)
 
+	// Attempt to acquire the daemon lock and defer its release.
+	lock, err := daemon.AcquireLock(logger)
+	if err != nil {
+		return fmt.Errorf("unable to acquire daemon lock: %w", err)
+	}
+	defer must.Release(lock, logger)
+
+	// Create a channel to track termination signals. We do this before creating
+	// and starting other infrastructure so that we can ensure things terminate
+	// smoothly, not mid-initialization.
+	signalTermination := make(chan os.Signal, 1)
+	signal.Notify(signalTermination, cmd.TerminationSignals...)
+
 	// Create a forwarding session manager and defer its shutdown.
 	forwardingManager, err := forwarding.NewManager(logger.Sublogger("forward"))
 	if err != nil {
@@ -74,7 +76,7 @@ func runMain(_ *cobra.Command, _ []string) error {
 	defer server.Stop()
 
 	// Create the daemon server, defer its shutdown, and register it.
-	daemonServer := daemonsvc.NewServer()
+	daemonServer := daemonsvc.NewServer(logger)
 	defer daemonServer.Shutdown()
 	daemonsvc.RegisterDaemonServer(server, daemonServer)
 
@@ -101,11 +103,11 @@ func runMain(_ *cobra.Command, _ []string) error {
 	if err := os.Remove(endpoint); err != nil && !errors.Is(err, fs.ErrNotExist) {
 		return fmt.Errorf("unable to remove existing daemon endpoint: %w", err)
 	}
-	listener, err := ipc.NewListener(endpoint)
+	listener, err := ipc.NewListener(endpoint, logger)
 	if err != nil {
 		return fmt.Errorf("unable to create daemon listener: %w", err)
 	}
-	defer listener.Close()
+	defer must.Close(listener, logger)
 
 	// Serve incoming requests and watch for server failure.
 	serverErrors := make(chan error, 1)

cmd/mutagen/daemon/unregister.go

@@ -1,16 +1,19 @@
 package daemon
 
 import (
+	"os"
+
 	"github.com/spf13/cobra"
 
 	"github.com/mutagen-io/mutagen/cmd"
-
 	"github.com/mutagen-io/mutagen/pkg/daemon"
+	"github.com/mutagen-io/mutagen/pkg/logging"
 )
 
 // unregisterMain is the entry point for the unregister command.
 func unregisterMain(_ *cobra.Command, _ []string) error {
-	return daemon.Unregister()
+	logger := logging.NewLogger(logging.LevelError, os.Stderr)
+	return daemon.Unregister(logger)
 }
 
 // unregisterCommand is the unregister command.

cmd/mutagen/project/flush.go

@@ -8,6 +8,8 @@ import (
 	"path/filepath"
 	"runtime"
 
+	"github.com/mutagen-io/mutagen/pkg/logging"
+	"github.com/mutagen-io/mutagen/pkg/must"
 	"github.com/spf13/cobra"
 
 	"github.com/mutagen-io/mutagen/cmd"
@@ -22,6 +24,8 @@ import (
 
 // flushMain is the entry point for the flush command.
 func flushMain(_ *cobra.Command, _ []string) error {
+	logger := logging.NewLogger(logging.LevelError, os.Stderr)
+
 	// Compute the name of the configuration file and ensure that our working
 	// directory is that in which the file resides. This is required for
 	// relative paths (including relative synchronization paths and relative
@@ -51,9 +55,9 @@ func flushMain(_ *cobra.Command, _ []string) error {
 		return fmt.Errorf("unable to create project locker: %w", err)
 	}
 	defer func() {
-		locker.Close()
+		must.Close(locker, logger)
 		if removeLockFileOnReturn && runtime.GOOS == "windows" {
-			os.Remove(lockPath)
+			must.OSRemove(lockPath, logger)
 		}
 	}()
 
@@ -70,12 +74,12 @@ func flushMain(_ *cobra.Command, _ []string) error {
 	defer func() {
 		if removeLockFileOnReturn {
 			if runtime.GOOS == "windows" {
-				locker.Truncate(0)
+				must.Truncate(locker, 0, logger)
 			} else {
-				os.Remove(lockPath)
+				must.OSRemove(lockPath, logger)
 			}
 		}
-		locker.Unlock()
+		must.Unlock(locker, logger)
 	}()
 
 	// Read the project identifier from the lock file. If the lock file is
@@ -100,7 +104,7 @@ func flushMain(_ *cobra.Command, _ []string) error {
 	if err != nil {
 		return fmt.Errorf("unable to connect to daemon: %w", err)
 	}
-	defer daemonConnection.Close()
+	defer must.Close(daemonConnection, logger)
 
 	// Compute the selection that we're going to use to flush sessions.
 	selection := &selection.Selection{
@@ -132,7 +136,7 @@ var flushConfiguration struct {
 	// projectFile is the path to the project file, if non-default.
 	projectFile string
 	// skipWait indicates whether or not the flush operation should block until
-	// a synchronization cycle completes for each sesion requested.
+	// a synchronization cycle completes for each session requested.
 	skipWait bool
 }
 

cmd/mutagen/project/list.go

@@ -8,6 +8,8 @@ import (
 	"path/filepath"
 	"runtime"
 
+	"github.com/mutagen-io/mutagen/pkg/logging"
+	"github.com/mutagen-io/mutagen/pkg/must"
 	"github.com/spf13/cobra"
 
 	"github.com/mutagen-io/mutagen/cmd"
@@ -23,6 +25,8 @@ import (
 
 // listMain is the entry point for the list command.
 func listMain(_ *cobra.Command, _ []string) error {
+	logger := logging.NewLogger(logging.LevelError, &bytes.Buffer{})
+
 	// Compute the name of the configuration file and ensure that our working
 	// directory is that in which the file resides. This is required for
 	// relative paths (including relative synchronization paths and relative
@@ -52,9 +56,9 @@ func listMain(_ *cobra.Command, _ []string) error {
 		return fmt.Errorf("unable to create project locker: %w", err)
 	}
 	defer func() {
-		locker.Close()
+		must.Close(locker, logger)
 		if removeLockFileOnReturn && runtime.GOOS == "windows" {
-			os.Remove(lockPath)
+			must.OSRemove(lockPath, logger)
 		}
 	}()
 
@@ -71,12 +75,12 @@ func listMain(_ *cobra.Command, _ []string) error {
 	defer func() {
 		if removeLockFileOnReturn {
 			if runtime.GOOS == "windows" {
-				locker.Truncate(0)
+				must.Truncate(locker, 0, logger)
 			} else {
-				os.Remove(lockPath)
+				must.OSRemove(lockPath, logger)
 			}
 		}
-		locker.Unlock()
+		must.Unlock(locker, logger)
 	}()
 
 	// Read the project identifier from the lock file. If the lock file is
@@ -101,7 +105,7 @@ func listMain(_ *cobra.Command, _ []string) error {
 	if err != nil {
 		return fmt.Errorf("unable to connect to daemon: %w", err)
 	}
-	defer daemonConnection.Close()
+	defer must.Close(daemonConnection, logger)
 
 	// Compute the selection that we're going to use to list sessions.
 	selection := &selection.Selection{

cmd/mutagen/project/pause.go

@@ -8,6 +8,8 @@ import (
 	"path/filepath"
 	"runtime"
 
+	"github.com/mutagen-io/mutagen/pkg/logging"
+	"github.com/mutagen-io/mutagen/pkg/must"
 	"github.com/spf13/cobra"
 
 	"github.com/mutagen-io/mutagen/cmd"
@@ -23,6 +25,8 @@ import (
 
 // pauseMain is the entry point for the pause command.
 func pauseMain(_ *cobra.Command, _ []string) error {
+	logger := logging.NewLogger(logging.LevelError, os.Stderr)
+
 	// Compute the name of the configuration file and ensure that our working
 	// directory is that in which the file resides. This is required for
 	// relative paths (including relative synchronization paths and relative
@@ -52,9 +56,9 @@ func pauseMain(_ *cobra.Command, _ []string) error {
 		return fmt.Errorf("unable to create project locker: %w", err)
 	}
 	defer func() {
-		locker.Close()
+		must.Close(locker, logger)
 		if removeLockFileOnReturn && runtime.GOOS == "windows" {
-			os.Remove(lockPath)
+			must.OSRemove(lockPath, logger)
 		}
 	}()
 
@@ -71,12 +75,12 @@ func pauseMain(_ *cobra.Command, _ []string) error {
 	defer func() {
 		if removeLockFileOnReturn {
 			if runtime.GOOS == "windows" {
-				locker.Truncate(0)
+				must.Truncate(locker, 0, logger)
 			} else {
-				os.Remove(lockPath)
+				must.OSRemove(lockPath, logger)
 			}
 		}
-		locker.Unlock()
+		must.Unlock(locker, logger)
 	}()
 
 	// Read the project identifier from the lock file. If the lock file is
@@ -115,7 +119,7 @@ func pauseMain(_ *cobra.Command, _ []string) error {
 	if err != nil {
 		return fmt.Errorf("unable to connect to daemon: %w", err)
 	}
-	defer daemonConnection.Close()
+	defer must.Close(daemonConnection, logger)
 
 	// Compute the selection that we're going to use to pause sessions.
 	selection := &selection.Selection{

cmd/mutagen/project/reset.go

@@ -8,6 +8,8 @@ import (
 	"path/filepath"
 	"runtime"
 
+	"github.com/mutagen-io/mutagen/pkg/logging"
+	"github.com/mutagen-io/mutagen/pkg/must"
 	"github.com/spf13/cobra"
 
 	"github.com/mutagen-io/mutagen/cmd"
@@ -22,6 +24,7 @@ import (
 
 // resetMain is the entry point for the reset command.
 func resetMain(_ *cobra.Command, _ []string) error {
+	logger := logging.NewLogger(logging.LevelError, os.Stderr)
 	// Compute the name of the configuration file and ensure that our working
 	// directory is that in which the file resides. This is required for
 	// relative paths (including relative synchronization paths and relative
@@ -51,9 +54,9 @@ func resetMain(_ *cobra.Command, _ []string) error {
 		return fmt.Errorf("unable to create project locker: %w", err)
 	}
 	defer func() {
-		locker.Close()
+		must.Close(locker, logger)
 		if removeLockFileOnReturn && runtime.GOOS == "windows" {
-			os.Remove(lockPath)
+			must.OSRemove(lockPath, logger)
 		}
 	}()
 
@@ -70,12 +73,12 @@ func resetMain(_ *cobra.Command, _ []string) error {
 	defer func() {
 		if removeLockFileOnReturn {
 			if runtime.GOOS == "windows" {
-				locker.Truncate(0)
+				must.Truncate(locker, 0, logger)
 			} else {
-				os.Remove(lockPath)
+				must.OSRemove(lockPath, logger)
 			}
 		}
-		locker.Unlock()
+		must.Unlock(locker, logger)
 	}()
 
 	// Read the project identifier from the lock file. If the lock file is
@@ -100,7 +103,7 @@ func resetMain(_ *cobra.Command, _ []string) error {
 	if err != nil {
 		return fmt.Errorf("unable to connect to daemon: %w", err)
 	}
-	defer daemonConnection.Close()
+	defer must.Close(daemonConnection, logger)
 
 	// Compute the selection that we're going to use to reset sessions.
 	selection := &selection.Selection{