From 31778c6e518cd12d0b091fbc3d55da08deab073a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jon=20H=C3=A4ggblad?= <jon.haggblad@gmail.com>
Date: Tue, 22 Nov 2022 11:13:38 +0100
Subject: [PATCH] WIP

---
 .../network-requester/src/core.rs             | 28 +++++++++----------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/service-providers/network-requester/src/core.rs b/service-providers/network-requester/src/core.rs
index 60ce900d90..496aef01b5 100644
--- a/service-providers/network-requester/src/core.rs
+++ b/service-providers/network-requester/src/core.rs
@@ -144,9 +144,12 @@ impl ServiceProvider {
                     log::info!(
                         "received LaneQueueLength lane: {lane}, queue_length: {queue_length}"
                     );
-                    let lane = TransmissionLane::ConnectionId(lane);
-                    let mut guard = lane_queue_lengths.lock().unwrap();
-                    guard.map.insert(lane, queue_length);
+                    if let Ok(mut lane_queue_lengths) = lane_queue_lengths.lock() {
+                        let lane = TransmissionLane::ConnectionId(lane);
+                        lane_queue_lengths.map.insert(lane, queue_length);
+                    } else {
+                        log::warn!("Unable to lock lane queue lengths, skipping updating received lane length")
+                    }
                     continue;
                 }
                 ServerResponse::Error(err) => {
@@ -401,17 +404,14 @@ impl ServiceProvider {
         println!("\nAll systems go. Press CTRL-C to stop the server.");
         // for each incoming message from the websocket... (which in 99.99% cases is going to be a mix message)
         loop {
-            let received = match Self::read_websocket_message(
-                &mut websocket_reader,
-                shared_lane_queue_lengths.clone(),
-            )
-            .await
-            {
-                Some(msg) => msg,
-                None => {
-                    error!("The websocket stream has finished!");
-                    return Ok(());
-                }
+            let Some(received) = Self::read_websocket_message(
+                    &mut websocket_reader,
+                    shared_lane_queue_lengths.clone()
+                )
+                .await
+            else {
+                log::error!("The websocket stream has finished!");
+                return Ok(());
             };
 
             let raw_message = received.message;