From 963096657ae75268d4864444ab85eafe5478a0de Mon Sep 17 00:00:00 2001 From: Jeremy Andrews Date: Sat, 31 Oct 2020 21:34:55 +0100 Subject: [PATCH 1/2] update nng --- Cargo.toml | 2 +- src/manager.rs | 6 +++--- src/worker.rs | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 1e44ccf3..1047ab7e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -32,7 +32,7 @@ tokio = { version = "0.2.20", features = ["fs", "io-util", "macros", "rt-core", url = "2.1" # optional dependencies -nng = { version = "0.5", optional = true } +nng = { version = "1.0.0-rc", optional = true } [features] default = ["reqwest/default-tls"] diff --git a/src/manager.rs b/src/manager.rs index 15c98f46..ccf542de 100644 --- a/src/manager.rs +++ b/src/manager.rs @@ -149,7 +149,7 @@ fn merge_requests_from_worker( /// Helper to send EXIT command to worker. fn tell_worker_to_exit(server: &Socket) -> bool { - let mut message = Message::new().unwrap(); + let mut message = Message::new(); serde_cbor::to_writer(&mut message, &GooseUserCommand::EXIT) .map_err(|error| eprintln!("{:?}", error)) .expect("failed to serialize user command"); @@ -438,7 +438,7 @@ pub async fn manager_main(mut goose_attack: GooseAttack) -> GooseAttack { } // Send vector of user initializers to worker. - let mut message = Message::new().unwrap(); + let mut message = Message::new(); serde_cbor::to_writer(&mut message, &users) .map_err(|error| eprintln!("{:?}", error)) .expect("failed to serialize user initializers"); @@ -468,7 +468,7 @@ pub async fn manager_main(mut goose_attack: GooseAttack) -> GooseAttack { } // Received message from known Worker. else { - let mut message = Message::new().unwrap(); + let mut message = Message::new(); // When starting a Gaggle, some Workers may start before others and // will send regular heartbeats to the Manager to confirm the load diff --git a/src/worker.rs b/src/worker.rs index 58c541dc..b7e97775 100644 --- a/src/worker.rs +++ b/src/worker.rs @@ -256,7 +256,7 @@ pub fn push_metrics_to_manager( get_response: bool, ) -> bool { debug!("[{}] pushing metrics to manager", get_worker_id(),); - let mut message = Message::new().unwrap(); + let mut message = Message::new(); serde_cbor::to_writer(&mut message, &metrics) .map_err(|error| eprintln!("{:?} worker_id({})", error, get_worker_id())) From d1411525882dcf8e67e9e6678b5d2a4f296553f5 Mon Sep 17 00:00:00 2001 From: Jeremy Andrews Date: Sun, 1 Nov 2020 06:47:12 +0100 Subject: [PATCH 2/2] document nng update --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7970f37a..5a6b0cd4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ - replace TermLogger with SimpleLogger for increased logging flexibility - add initial OCI Dockerfile for container-based workflows - use checked subtraction when calculating drift duration to prevent panic + - update `nng-rs` dependency to fix bug when testing that the manager is ready ## 0.10.3 Oct 14, 2020 - fixup sticky redirect tests to properly test functionality