Skip to content

Commit

Permalink
Merge pull request #1453 from zowe/fix-daemon-start-timeout
Browse files Browse the repository at this point in the history
Fix daemon binary startup error
  • Loading branch information
awharn authored Jun 20, 2022
2 parents 5224fe6 + b66b5b5 commit 702a20f
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 4 deletions.
4 changes: 4 additions & 0 deletions packages/cli/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion zowex/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion zowex/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "zowe"
version = "1.0.0"
version = "1.0.1"
authors = ["Zowe Project"]
edition = "2018"
license = "EPL-2.0"
Expand Down
4 changes: 2 additions & 2 deletions zowex/src/comm.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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
);
Expand Down Expand Up @@ -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";
Expand Down

0 comments on commit 702a20f

Please sign in to comment.