Add configuration for the write lock the cache is using to update (#415)

1 files changed, 17 insertions, 8 deletions

diff --git a/src/client/dispatch.rs b/src/client/dispatch.rs
index 5f88c34..f3585a8 100644
--- a/src/client/dispatch.rs
+++ b/src/client/dispatch.rs
@@ -25,20 +25,29 @@ use std::time::Duration;
 #[cfg(feature = "cache")]
 use super::CACHE;
 
+lazy_static! {
+    pub static ref CACHE_TRY_WRITE_DURATION: Option<Duration> =
+        CACHE.read().get_try_write_duration();
+}
+
 macro_rules! update {
     ($event:expr) => {
         {
             #[cfg(feature = "cache")]
             {
-                if let Some(mut lock) = CACHE.try_write_for(Duration::from_millis(10)) {
-                    lock.update(&mut $event)
+                if let Some(duration) = *CACHE_TRY_WRITE_DURATION {
+                    CACHE.try_write_for(duration)
+                        .and_then(|mut lock| lock.update(&mut $event))
+                        .or_else(|| {
+                            warn!(
+                                "[dispatch] Possible deadlock: couldn't unlock cache to update with event: {:?}",
+                                $event,
+                            );
+
+                            None
+                    })
                 } else {
-                    warn!(
-                        "[dispatch] Possible deadlock: couldn't unlock cache to update with event: {:?}",
-                        $event,
-                    );
-
-                    None
+                    CACHE.write().update(&mut $event)
                 }
             }
         }