GODT-1671: Implement Quit & Restart mechanism

internal/app/base/base.go

@@ -93,10 +93,11 @@ type Base struct {
 	TLS            *tls.TLS
 	Autostart      *autostart.App
 
-	Name    string // the app's name
-	usage   string // the app's usage description
-	command string // the command used to launch the app (either the exe path or the launcher path)
-	restart bool   // whether the app is currently set to restart
+	Name     string // the app's name
+	usage    string // the app's usage description
+	command  string // the command used to launch the app (either the exe path or the launcher path)
+	restart  bool   // whether the app is currently set to restart
+	launcher string // launcher to be used if not set in args
 
 	teardown []func() error // actions to perform when app is exiting
 }
@@ -322,6 +323,11 @@ func (b *Base) SetToRestart() {
 	b.restart = true
 }
 
+func (b *Base) ForceLauncher(launcher string) {
+	b.launcher = launcher
+	b.setupLauncher(launcher)
+}
+
 // AddTeardownAction adds an action to perform during app teardown.
 func (b *Base) AddTeardownAction(fn func() error) {
 	b.teardown = append(b.teardown, fn)
@@ -335,10 +341,7 @@ func (b *Base) wrapMainLoop(appMainLoop func(*Base, *cli.Context) error) cli.Act
 		// If launcher was used to start the app, use that for restart
 		// and autostart.
 		if launcher := c.String(FlagLauncher); launcher != "" {
-			b.command = launcher
-			// Bridge supports no-window option which we should use
-			// for autostart.
-			b.Autostart.Exec = []string{launcher, "--" + FlagNoWindow}
+			b.setupLauncher(launcher)
 		}
 
 		if c.Bool(flagCPUProfile) {
@@ -402,3 +405,10 @@ func (b *Base) doTeardown() error {
 
 	return nil
 }
+
+func (b *Base) setupLauncher(launcher string) {
+	b.command = launcher
+	// Bridge supports no-window option which we should use
+	// for autostart.
+	b.Autostart.Exec = []string{launcher, "--" + FlagNoWindow}
+}

internal/app/base/restart.go

@@ -38,6 +38,10 @@ func (b *Base) restartApp(crash bool) error {
 		args = os.Args[1:]
 	}
 
+	if b.launcher != "" {
+		args = forceLauncherFlag(args, b.launcher)
+	}
+
 	logrus.
 		WithField("command", b.command).
 		WithField("args", args).
@@ -78,3 +82,29 @@ func incrementRestartFlag(args []string) []string {
 
 	return res
 }
+
+// forceLauncherFlag  replace or add the launcher args with the one set in the app.
+func forceLauncherFlag(args []string, launcher string) []string {
+	res := append([]string{}, args...)
+
+	hasFlag := false
+
+	for k, v := range res {
+		if v != "--launcher" {
+			continue
+		}
+
+		if k+1 >= len(res) {
+			continue
+		}
+
+		hasFlag = true
+		res[k+1] = launcher
+	}
+
+	if !hasFlag {
+		res = append(res, "--launcher", launcher)
+	}
+
+	return res
+}