From 88f503f27fd0788f8868a02937aed104c80656c4 Mon Sep 17 00:00:00 2001 From: Roey Darwish Dror Date: Sun, 23 Feb 2020 21:18:10 +0200 Subject: [PATCH 1/3] Print a better error when the daemon isn't running (fix #39) --- cmd/control/cmd/status.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/cmd/control/cmd/status.go b/cmd/control/cmd/status.go index 5cfbf1d..e2b9c69 100644 --- a/cmd/control/cmd/status.go +++ b/cmd/control/cmd/status.go @@ -24,7 +24,9 @@ var statusCmd = &cobra.Command{ fmt.Println(" * installed: " + version + " (" + commit + ")") resp, err := getDaemonStatus(config.Port) if err != nil { - fmt.Println(" * daemon: NOT RUNNING!") + fmt.Println(" * RESH-DAEMON IS NOT RUNNING") + exitCode = status.Fail + return } else { fmt.Println(" * daemon: " + resp.Version + " (" + resp.Commit + ")") } @@ -65,7 +67,6 @@ func getDaemonStatus(port int) (msg.StatusResponse, error) { url := "http://localhost:" + strconv.Itoa(port) + "/status" resp, err := http.Get(url) if err != nil { - log.Println("Daemon is not running!", err) return mess, err } defer resp.Body.Close() From 6e974d00c70124272b96f144799fd7b473524523 Mon Sep 17 00:00:00 2001 From: Roey Darwish Dror Date: Wed, 26 Feb 2020 08:41:46 +0200 Subject: [PATCH 2/3] CR fixes --- cmd/control/cmd/status.go | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/cmd/control/cmd/status.go b/cmd/control/cmd/status.go index e2b9c69..420d36b 100644 --- a/cmd/control/cmd/status.go +++ b/cmd/control/cmd/status.go @@ -22,14 +22,6 @@ var statusCmd = &cobra.Command{ fmt.Println() fmt.Println("Resh versions ...") fmt.Println(" * installed: " + version + " (" + commit + ")") - resp, err := getDaemonStatus(config.Port) - if err != nil { - fmt.Println(" * RESH-DAEMON IS NOT RUNNING") - exitCode = status.Fail - return - } else { - fmt.Println(" * daemon: " + resp.Version + " (" + resp.Commit + ")") - } versionEnv, found := os.LookupEnv("__RESH_VERSION") if found == false { versionEnv = "UNKNOWN!" @@ -39,6 +31,15 @@ var statusCmd = &cobra.Command{ commitEnv = "unknown" } fmt.Println(" * this session: " + versionEnv + " (" + commitEnv + ")") + + resp, err := getDaemonStatus(config.Port) + if err != nil { + fmt.Println(" * RESH-DAEMON IS NOT RUNNING") + exitCode = status.Fail + return + } + fmt.Println(" * daemon: " + resp.Version + " (" + resp.Commit + ")") + if version != resp.Version || version != versionEnv { fmt.Println(" * THERE IS A MISMATCH BETWEEN VERSIONS!") fmt.Println(" * Please REPORT this here: https://github.com/curusarn/resh/issues") From d37acb57d11279e2c34b61f7f0d89e9c7a14b2f1 Mon Sep 17 00:00:00 2001 From: Roey Darwish Dror Date: Wed, 26 Feb 2020 08:45:08 +0200 Subject: [PATCH 3/3] CR fixes --- cmd/control/cmd/status.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/cmd/control/cmd/status.go b/cmd/control/cmd/status.go index 420d36b..796cdf4 100644 --- a/cmd/control/cmd/status.go +++ b/cmd/control/cmd/status.go @@ -35,6 +35,8 @@ var statusCmd = &cobra.Command{ resp, err := getDaemonStatus(config.Port) if err != nil { fmt.Println(" * RESH-DAEMON IS NOT RUNNING") + fmt.Println(" * Please REPORT this here: https://github.com/curusarn/resh/issues") + fmt.Println(" * Please RESTART this terminal window") exitCode = status.Fail return }