Retry on openApplication error (darwin); More error logging

updater.go

@@ -710,20 +710,23 @@ func (u *Updater) restart(ctx Context, updateQuitResponse keybase1.UpdateQuitRes
 	}
 
 	u.log.Debug("App reported its PID as %d", updateQuitResponse.Pid)
-	p, err := os.FindProcess(updateQuitResponse.Pid)
-	if err != nil {
+	p, perr := os.FindProcess(updateQuitResponse.Pid)
+	if perr != nil {
+		err = fmt.Errorf("Error finding process: %s", perr)
 		return
 	}
 	u.log.Debug("Killing app")
-	err = p.Kill()
-	if err != nil {
+	kerr := p.Kill()
+	if kerr != nil {
+		err = fmt.Errorf("Error killing app: %s", kerr)
 		return
 	}
 	didQuit = true
 
 	u.log.Debug("Opening app at %s", updateQuitResponse.ApplicationPath)
-	err = openApplication(updateQuitResponse.ApplicationPath)
-	if err != nil {
+	oerr := u.openApplication(updateQuitResponse.ApplicationPath)
+	if oerr != nil {
+		err = fmt.Errorf("Error opening app: %s", oerr)
 		return
 	}
 

updater_default.go

@@ -11,7 +11,7 @@ func (u *Updater) checkPlatformSpecificUpdate(sourcePath string, destinationPath
 	return nil
 }
 
-func openApplication(applicationPath string) error {
+func (u *Updater) openApplication(applicationPath string) error {
 	return fmt.Errorf("Open application not supported on this platform")
 }
 

updater_osx.go

@@ -6,6 +6,7 @@
 package updater
 
 import (
+	"fmt"
 	"os"
 	"os/exec"
 	"os/user"
@@ -68,9 +69,20 @@ func (u *Updater) checkPlatformSpecificUpdate(sourcePath string, destinationPath
 	return nil
 }
 
-func openApplication(applicationPath string) error {
-	_, err := exec.Command("/usr/bin/open", applicationPath).Output()
-	return err
+func (u *Updater) openApplication(applicationPath string) error {
+	tryOpen := func() error {
+		out, err := exec.Command("/usr/bin/open", applicationPath).CombinedOutput()
+		if err != nil {
+			return fmt.Errorf("%s; %s", err, string(out))
+		}
+		return nil
+	}
+	if err := tryOpen(); err != nil {
+		u.log.Errorf("Open error, trying again in a few seconds; %s", err)
+		time.Sleep(3 * time.Second)
+		return tryOpen()
+	}
+	return nil
 }
 
 func (u *Updater) applyUpdate(localPath string) (err error) {
@@ -82,9 +94,9 @@ func (u *Updater) applyUpdate(localPath string) (err error) {
 
 	// Update spotlight, ignore (but log) errors
 	u.log.Debug("Updating spotlight: %s", destinationPath)
-	mdimportOut, mdierr := exec.Command("/usr/bin/mdimport", destinationPath).Output()
+	mdimportOut, mdierr := exec.Command("/usr/bin/mdimport", destinationPath).CombinedOutput()
 	if mdierr != nil {
-		u.log.Errorf("Error trying to update spotlight: %s; %s", mdierr, mdimportOut)
+		u.log.Errorf("Error trying to update spotlight: %s; %s", mdierr, string(mdimportOut))
 	}
 	return
 }

updater_windows.go

@@ -15,7 +15,7 @@ func (u *Updater) checkPlatformSpecificUpdate(sourcePath string, destinationPath
 	return nil
 }
 
-func openApplication(applicationPath string) error {
+func (u *Updater) openApplication(applicationPath string) error {
 	return fmt.Errorf("Open application not supported on this platform")
 }