From b66b5b5c51f61d14aa9f1b46fb81b48b6d87f073 Mon Sep 17 00:00:00 2001
From: "Andrew W. Harn" <andrew.harn@broadcom.com>
Date: Mon, 20 Jun 2022 13:21:01 -0400
Subject: [PATCH] Fix daemon binary startup error

Signed-off-by: Andrew W. Harn <andrew.harn@broadcom.com>
---
 packages/cli/CHANGELOG.md | 4 ++++
 zowex/Cargo.lock          | 2 +-
 zowex/Cargo.toml          | 2 +-
 zowex/src/comm.rs         | 4 ++--
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/packages/cli/CHANGELOG.md b/packages/cli/CHANGELOG.md
index 015840900b..dad909dab7 100644
--- a/packages/cli/CHANGELOG.md
+++ b/packages/cli/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 All notable changes to the Zowe CLI package will be documented in this file.
 
+## Recent Changes
+
+- BugFix: Fixed the Zowe Daemon binary exiting with an error if the daemon server does not start within 3 seconds.
+
 ## `7.2.3`
 
 - BugFix: Updated Imperative to address `ProfileInfo` related issues.
diff --git a/zowex/Cargo.lock b/zowex/Cargo.lock
index cc32ed0dc2..318bd08edc 100644
--- a/zowex/Cargo.lock
+++ b/zowex/Cargo.lock
@@ -448,7 +448,7 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
 
 [[package]]
 name = "zowe"
-version = "1.0.0"
+version = "1.0.1"
 dependencies = [
  "atty",
  "base64",
diff --git a/zowex/Cargo.toml b/zowex/Cargo.toml
index 46193c6a24..da2f3e6475 100644
--- a/zowex/Cargo.toml
+++ b/zowex/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "zowe"
-version = "1.0.0"
+version = "1.0.1"
 authors = ["Zowe Project"]
 edition = "2018"
 license = "EPL-2.0"
diff --git a/zowex/src/comm.rs b/zowex/src/comm.rs
index 4065cfb963..e5668baf6d 100644
--- a/zowex/src/comm.rs
+++ b/zowex/src/comm.rs
@@ -88,7 +88,7 @@ pub fn comm_establish_connection(njs_zowe_path: &str, daemon_socket: &str) -> io
                 // start the daemon and continue trying to connect
                 we_started_daemon = true;
                 cmd_to_show = proc_start_daemon(njs_zowe_path);
-            } else if we_started_daemon {
+            } else if we_started_daemon && conn_retries > THREE_MIN_OF_RETRIES {
                 println!("The Zowe daemon that we started is not running on socket: {}.",
                     daemon_socket
                 );
@@ -122,7 +122,7 @@ pub fn comm_establish_connection(njs_zowe_path: &str, daemon_socket: &str) -> io
         }
 
         let retry_msg;
-        if we_started_daemon {
+        if we_started_daemon && !daemon_proc_info.is_running {
             retry_msg = "Waiting for the Zowe daemon to start";
         } else {
             retry_msg = "Attempting to connect to the Zowe daemon";