Merge pull request #211 from jeremyandrews/nng

update nng

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

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"]

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

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()))