Daemon: Remove tray application message when daemon not running in wi…

…ndows In windows now daemon can be started as part of setup so now this message around tray application doesn't make sense. Generic daemon not running message is good enough for windows also like it is for other platforms.
GingerGeek · Apr 22, 2022 · 0a7df3b · 0a7df3b
1 parent cb409b4
commit 0a7df3b
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 17 deletions.
diff --git a/cmd/crc/cmd/daemon_darwin.go b/cmd/crc/cmd/daemon_darwin.go
@@ -32,9 +32,5 @@ func checkIfDaemonIsRunning() (bool, error) {
 	return checkDaemonVersion()
 }
 
-func daemonNotRunningMessage() string {
-	return genericDaemonNotRunningMessage
-}
-
 func startupDone() {
 }
diff --git a/cmd/crc/cmd/daemon_linux.go b/cmd/crc/cmd/daemon_linux.go
@@ -124,10 +124,6 @@ func httpListener() (net.Listener, error) {
 	return ln, nil
 }
 
-func daemonNotRunningMessage() string {
-	return genericDaemonNotRunningMessage
-}
-
 func startupDone() {
 	_, _ = daemon.SdNotify(false, daemon.SdNotifyReady)
 }
diff --git a/cmd/crc/cmd/daemon_windows.go b/cmd/crc/cmd/daemon_windows.go
@@ -6,7 +6,6 @@ import (
 	"github.com/Microsoft/go-winio"
 	"github.com/code-ready/crc/pkg/crc/constants"
 	"github.com/code-ready/crc/pkg/crc/logging"
-	crcversion "github.com/code-ready/crc/pkg/crc/version"
 	"github.com/containers/gvisor-tap-vsock/pkg/transport"
 )
 
@@ -36,12 +35,5 @@ func checkIfDaemonIsRunning() (bool, error) {
 	return checkDaemonVersion()
 }
 
-func daemonNotRunningMessage() string {
-	if crcversion.IsInstaller() {
-		return "Is CRC tray application running? Cannot reach daemon API"
-	}
-	return genericDaemonNotRunningMessage
-}
-
 func startupDone() {
 }
diff --git a/cmd/crc/cmd/start.go b/cmd/crc/cmd/start.go
@@ -324,7 +324,7 @@ func checkDaemonStarted() error {
 	daemonClient := daemonclient.New()
 	version, err := daemonClient.APIClient.Version()
 	if err != nil {
-		return pkgerrors.Wrap(err, daemonNotRunningMessage())
+		return pkgerrors.Wrap(err, genericDaemonNotRunningMessage)
 	}
 	if version.CrcVersion != crcversion.GetCRCVersion() {
 		return fmt.Errorf("The executable version (%s) doesn't match the daemon version (%s)", crcversion.GetCRCVersion(), version.CrcVersion)