chore: refactor daemon (#312)

* chore: refactor network daemon

app/app.go

@@ -15,6 +15,7 @@ import (
 	"github.com/abiosoft/colima/environment/container/ubuntu"
 	"github.com/abiosoft/colima/environment/host"
 	"github.com/abiosoft/colima/environment/vm/lima"
+	"github.com/abiosoft/colima/environment/vm/lima/limautil"
 	log "github.com/sirupsen/logrus"
 )
 
@@ -208,15 +209,15 @@ func (c colimaApp) SSH(layer bool, args ...string) error {
 		return c.guest.RunInteractive(args...)
 	}
 
-	conf, err := lima.InstanceConfig()
+	conf, err := limautil.InstanceConfig()
 	if err != nil {
 		return err
 	}
 	if !conf.Layer {
 		return c.guest.RunInteractive(args...)
 	}
 
-	resp, err := lima.ShowSSH(config.CurrentProfile().ID, layer, "args")
+	resp, err := limautil.ShowSSH(config.CurrentProfile().ID, layer, "args")
 	if err != nil {
 		return fmt.Errorf("error getting ssh config: %w", err)
 	}
@@ -256,7 +257,7 @@ func (c colimaApp) Status() error {
 	log.Println(config.CurrentProfile().DisplayName, "is running")
 	log.Println("arch:", c.guest.Arch())
 	log.Println("runtime:", currentRuntime)
-	if conf, err := lima.InstanceConfig(); err == nil {
+	if conf, err := limautil.InstanceConfig(); err == nil {
 		log.Println("mountType:", conf.MountType)
 	}
 	if currentRuntime == docker.Name {

cmd/colima/main.go

@@ -10,12 +10,12 @@ import (
 	_ "github.com/abiosoft/colima/cmd"        // for other commands
 	_ "github.com/abiosoft/colima/cmd/daemon" // for vmnet daemon
 	_ "github.com/abiosoft/colima/embedded"   // for embedded assets
-	"github.com/abiosoft/colima/environment/vm/lima/network/daemon/gvproxy"
-	"github.com/abiosoft/colima/util"
-	"github.com/sirupsen/logrus"
 
 	"github.com/abiosoft/colima/cmd/root"
 	"github.com/abiosoft/colima/config"
+	"github.com/abiosoft/colima/daemon/process/gvproxy"
+	"github.com/abiosoft/colima/util"
+	"github.com/sirupsen/logrus"
 )
 
 func main() {
@@ -27,6 +27,7 @@ func main() {
 		root.Execute()
 	}
 }
+
 func qemuWrapper(qemu string) {
 	if profile := os.Getenv(config.SubprocessProfileEnvVar); profile != "" {
 		config.SetProfile(profile)
@@ -79,6 +80,12 @@ func qemuWrapper(qemu string) {
 		cmd.ExtraFiles = append(cmd.ExtraFiles, fd)
 	}
 
-	_ = cmd.Run()
+	err := cmd.Run()
+	if err != nil {
+		if err, ok := err.(*exec.ExitError); ok {
+			os.Exit(err.ExitCode())
+		}
+		os.Exit(1)
+	}
 
 }

cmd/daemon/cmd.go

@@ -4,9 +4,9 @@ import (
 	"context"
 	"time"
 
-	"github.com/abiosoft/colima/environment/vm/lima/network/daemon"
-	"github.com/abiosoft/colima/environment/vm/lima/network/daemon/gvproxy"
-	"github.com/abiosoft/colima/environment/vm/lima/network/daemon/vmnet"
+	"github.com/abiosoft/colima/daemon/process"
+	"github.com/abiosoft/colima/daemon/process/gvproxy"
+	"github.com/abiosoft/colima/daemon/process/vmnet"
 
 	"github.com/abiosoft/colima/cmd/root"
 	"github.com/abiosoft/colima/config"
@@ -18,10 +18,6 @@ var daemonCmd = &cobra.Command{
 	Short:  "daemon",
 	Long:   `runner for background daemons.`,
 	Hidden: true,
-	PersistentPreRun: func(cmd *cobra.Command, args []string) {
-		cmd.SilenceUsage = true
-		cmd.SilenceErrors = true
-	},
 }
 
 var startCmd = &cobra.Command{
@@ -31,16 +27,17 @@ var startCmd = &cobra.Command{
 	Args:  cobra.ExactArgs(1),
 	RunE: func(cmd *cobra.Command, args []string) error {
 		config.SetProfile(args[0])
+		ctx := cmd.Context()
 
-		var processes []daemon.Process
+		var processes []process.Process
 		if daemonArgs.vmnet {
 			processes = append(processes, vmnet.New())
 		}
 		if daemonArgs.gvproxy {
 			processes = append(processes, gvproxy.New())
 		}
 
-		return start(cmd.Context(), processes)
+		return start(ctx, processes)
 	},
 }
 
@@ -74,8 +71,11 @@ var statusCmd = &cobra.Command{
 }
 
 var daemonArgs struct {
-	vmnet   bool
-	gvproxy bool
+	vmnet    bool
+	gvproxy  bool
+	fsnotify bool
+
+	verbose bool
 }
 
 func init() {
@@ -87,4 +87,5 @@ func init() {
 
 	startCmd.Flags().BoolVar(&daemonArgs.vmnet, "vmnet", false, "start vmnet")
 	startCmd.Flags().BoolVar(&daemonArgs.gvproxy, "gvproxy", false, "start gvproxy")
+	startCmd.Flags().BoolVar(&daemonArgs.fsnotify, "fsnotify", false, "start fsnotify")
 }

cmd/daemon/daemon.go

@@ -7,16 +7,17 @@ import (
 	"os/signal"
 	"path/filepath"
 	"strconv"
+	"sync"
 	"syscall"
 	"time"
 
 	"github.com/abiosoft/colima/cli"
-	"github.com/abiosoft/colima/environment/vm/lima/network/daemon"
+	"github.com/abiosoft/colima/daemon/process"
 	godaemon "github.com/sevlyar/go-daemon"
 	"github.com/sirupsen/logrus"
 )
 
-var dir = daemon.Dir
+var dir = process.Dir
 
 // daemonize creates the daemon and returns if this is a child process
 func daemonize() (ctx *godaemon.Context, child bool, err error) {
@@ -49,7 +50,7 @@ func daemonize() (ctx *godaemon.Context, child bool, err error) {
 	return ctx, true, nil
 }
 
-func start(ctx context.Context, processes []daemon.Process) error {
+func start(ctx context.Context, processes []process.Process) error {
 	if status() == nil {
 		logrus.Info("daemon already running, startup ignored")
 		return nil
@@ -75,7 +76,7 @@ func start(ctx context.Context, processes []daemon.Process) error {
 	ctx, stop := signal.NotifyContext(ctx, syscall.SIGINT, syscall.SIGTERM)
 	defer stop()
 
-	return daemon.Run(ctx, processes...)
+	return RunProcesses(ctx, processes...)
 }
 
 func stop(ctx context.Context) error {
@@ -153,3 +154,32 @@ func Info() struct {
 		LogFile: filepath.Join(dir, logFileName),
 	}
 }
+
+// Run runs the daemon with background processes.
+// NOTE: this must be called from the program entrypoint with minimal intermediary logic
+// due to the creation of the daemon.
+func RunProcesses(ctx context.Context, processes ...process.Process) error {
+	ctx, stop := context.WithCancel(ctx)
+	defer stop()
+
+	var wg sync.WaitGroup
+	wg.Add(len(processes))
+
+	for _, bg := range processes {
+		go func(bg process.Process) {
+			err := bg.Start(ctx)
+			if err != nil {
+				logrus.Error(fmt.Errorf("error starting %s: %w", bg.Name(), err))
+				stop()
+			}
+			wg.Done()
+		}(bg)
+	}
+
+	<-ctx.Done()
+	logrus.Info("terminate signal received")
+
+	wg.Wait()
+
+	return ctx.Err()
+}

cmd/daemon/daemon_test.go

@@ -7,7 +7,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/abiosoft/colima/environment/vm/lima/network/daemon"
+	"github.com/abiosoft/colima/daemon/process"
 )
 
 var testDir string
@@ -19,22 +19,28 @@ func setDir(t *testing.T) {
 	dir = func() string { return testDir }
 }
 
-func TestStart(t *testing.T) {
-	setDir(t)
-	info := Info()
-
+func getProcesses() []process.Process {
 	var addresses = []string{
 		"localhost",
 		"127.0.0.1",
 	}
 
-	t.Log("pidfile", info.PidFile)
-
-	var processes []daemon.Process
+	var processes []process.Process
 	for _, add := range addresses {
 		processes = append(processes, &pinger{address: add})
 	}
 
+	return processes
+}
+
+func TestStart(t *testing.T) {
+	setDir(t)
+	info := Info()
+
+	processes := getProcesses()
+
+	t.Log("pidfile", info.PidFile)
+
 	timeout := time.Second * 5
 	ctx, cancel := context.WithTimeout(context.Background(), timeout)
 	defer cancel()
@@ -54,6 +60,8 @@ func TestStart(t *testing.T) {
 			default:
 				if p, err := os.ReadFile(info.PidFile); err == nil && len(p) > 0 {
 					break loop
+				} else if err != nil {
+					t.Logf("encountered err: %v", err)
 				}
 				time.Sleep(1 * time.Second)
 			}
@@ -79,7 +87,32 @@ func TestStart(t *testing.T) {
 
 }
 
-var _ daemon.Process = (*pinger)(nil)
+func TestRunProcesses(t *testing.T) {
+	processes := getProcesses()
+
+	timeout := time.Second * 5
+	ctx, cancel := context.WithTimeout(context.Background(), timeout)
+
+	// start the processes
+	done := make(chan error, 1)
+	go func() {
+		done <- RunProcesses(ctx, processes...)
+	}()
+
+	cancel()
+
+	select {
+	case <-ctx.Done():
+		if err := ctx.Err(); err != context.Canceled {
+			t.Error(err)
+		}
+	case err := <-done:
+		t.Error(err)
+	}
+
+}
+
+var _ process.Process = (*pinger)(nil)
 
 type pinger struct {
 	address string
@@ -98,7 +131,7 @@ func (p *pinger) Start(ctx context.Context) error {
 }
 
 // Start implements BgProcess
-func (p *pinger) Dependencies() ([]daemon.Dependency, bool) { return nil, false }
+func (p *pinger) Dependencies() ([]process.Dependency, bool) { return nil, false }
 
 func (p *pinger) run(ctx context.Context, command string, args ...string) error {
 	cmd := exec.CommandContext(ctx, command, args...)

cmd/list.go

@@ -6,7 +6,7 @@ import (
 	"text/tabwriter"
 
 	"github.com/abiosoft/colima/cmd/root"
-	"github.com/abiosoft/colima/environment/vm/lima"
+	"github.com/abiosoft/colima/environment/vm/lima/limautil"
 	"github.com/docker/go-units"
 	"github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
@@ -26,7 +26,7 @@ var listCmd = &cobra.Command{
 A new instance can be created during 'colima start' by specifying the '--profile' flag.`,
 	Args: cobra.NoArgs,
 	RunE: func(cmd *cobra.Command, args []string) error {
-		instances, err := lima.Instances()
+		instances, err := limautil.Instances()
 		if err != nil {
 			return err
 		}

cmd/ssh-config.go

@@ -5,7 +5,7 @@ import (
 
 	"github.com/abiosoft/colima/cmd/root"
 	"github.com/abiosoft/colima/config"
-	"github.com/abiosoft/colima/environment/vm/lima"
+	"github.com/abiosoft/colima/environment/vm/lima/limautil"
 	"github.com/spf13/cobra"
 )
 
@@ -16,7 +16,7 @@ var sshConfigCmd = &cobra.Command{
 	Long:  `Show configuration of the SSH connection to the VM.`,
 	Args:  cobra.MaximumNArgs(1),
 	RunE: func(cmd *cobra.Command, args []string) error {
-		resp, err := lima.ShowSSH(config.CurrentProfile().ID, sshConfigCmdArgs.layer, sshConfigCmdArgs.format)
+		resp, err := limautil.ShowSSH(config.CurrentProfile().ID, sshConfigCmdArgs.layer, sshConfigCmdArgs.format)
 		if err == nil {
 			fmt.Println(resp.Output)
 		}

config/config.go

@@ -132,6 +132,17 @@ func (m Mount) CleanPath() (string, error) {
 	return strings.TrimSuffix(str, "/") + "/", nil
 }
 
+func (c Config) MountsOrDefault() []Mount {
+	if len(c.Mounts) > 0 {
+		return c.Mounts
+	}
+
+	return []Mount{
+		{Location: util.HomeDir(), Writable: true},
+		{Location: filepath.Join("/tmp", CurrentProfile().ID), Writable: true},
+	}
+}
+
 // Empty checks if the configuration is empty.
 func (c Config) Empty() bool { return c.Runtime == "" } // this may be better but not really needed.