pull/92/head
Roey Darwish Dror 6 years ago
parent 88f503f27f
commit 6e974d00c7
  1. 17
      cmd/control/cmd/status.go

@ -22,14 +22,6 @@ var statusCmd = &cobra.Command{
fmt.Println() fmt.Println()
fmt.Println("Resh versions ...") fmt.Println("Resh versions ...")
fmt.Println(" * installed: " + version + " (" + commit + ")") 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") versionEnv, found := os.LookupEnv("__RESH_VERSION")
if found == false { if found == false {
versionEnv = "UNKNOWN!" versionEnv = "UNKNOWN!"
@ -39,6 +31,15 @@ var statusCmd = &cobra.Command{
commitEnv = "unknown" commitEnv = "unknown"
} }
fmt.Println(" * this session: " + versionEnv + " (" + commitEnv + ")") 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 { if version != resp.Version || version != versionEnv {
fmt.Println(" * THERE IS A MISMATCH BETWEEN VERSIONS!") fmt.Println(" * THERE IS A MISMATCH BETWEEN VERSIONS!")
fmt.Println(" * Please REPORT this here: https://github.com/curusarn/resh/issues") fmt.Println(" * Please REPORT this here: https://github.com/curusarn/resh/issues")

Loading…
Cancel
Save