[config] dispatcher.send_timeout_ms in config

bin/gargantext-cli/CLI/Ini.hs

@@ -144,4 +144,5 @@ defaultNotificationsConfig =
                              , _nc_ce_send_timeout_ms = 200
                              , _nc_dispatcher_bind = "tcp://*:5561"
                              , _nc_dispatcher_connect = "tcp://localhost:5561"
+                             , _nc_dispatcher_send_timeout_ms = 500
                              , _nc_dispatcher_throttle_ms = 500 }

gargantext-settings.toml_toModify

@@ -132,6 +132,8 @@ send_timeout_ms = 200
 [notifications.dispatcher]
 bind = "tcp://:5561"
 connect = "tcp://127.0.0.1:5561"
+# see https://gitlab.iscpif.fr/gargantext/haskell-gargantext/commit/77a687ea1483441675320fd2413fac52bb112a4c
+send_timeout_ms = 500
 # Same dispatcher messages are throttled, this is the throttle delay
 throttle_ms = 500
 

src/Gargantext/Core/Config/Types.hs

@@ -321,12 +321,13 @@ makeLenses ''APIsConfig
 
 
 data NotificationsConfig =
-  NotificationsConfig { _nc_central_exchange_bind    :: ~T.Text
-                      , _nc_central_exchange_connect :: ~T.Text
-                      , _nc_ce_send_timeout_ms       :: ~Int
-                      , _nc_dispatcher_bind          :: ~T.Text
-                      , _nc_dispatcher_connect       :: ~T.Text
-                      , _nc_dispatcher_throttle_ms   :: ~Int }
+  NotificationsConfig { _nc_central_exchange_bind      :: ~T.Text
+                      , _nc_central_exchange_connect   :: ~T.Text
+                      , _nc_ce_send_timeout_ms         :: ~Int
+                      , _nc_dispatcher_bind            :: ~T.Text
+                      , _nc_dispatcher_connect         :: ~T.Text
+                      , _nc_dispatcher_send_timeout_ms :: ~Int
+                      , _nc_dispatcher_throttle_ms     :: ~Int }
   deriving (Show, Eq)
 instance FromValue NotificationsConfig where
   fromValue = parseTableFromValue $ do
@@ -336,12 +337,13 @@ instance FromValue NotificationsConfig where
         c <- reqKey "connect"
         t <- reqKey "send_timeout_ms"
         pure (b, c, t)
-    (_nc_dispatcher_bind, _nc_dispatcher_connect, _nc_dispatcher_throttle_ms) <-
+    (_nc_dispatcher_bind, _nc_dispatcher_connect, _nc_dispatcher_send_timeout_ms, _nc_dispatcher_throttle_ms) <-
       reqKeyOf "dispatcher" $ parseTableFromValue $ do
         b <- reqKey "bind"
         c <- reqKey "connect"
-        t <- reqKey "throttle_ms"
-        pure (b, c, t)
+        t <- reqKey "send_timeout_ms"
+        tt <- reqKey "throttle_ms"
+        pure (b, c, t, tt)
     return $ NotificationsConfig { .. }
 instance ToValue NotificationsConfig where
   toValue = defaultTableToValue
@@ -354,5 +356,6 @@ instance ToTable NotificationsConfig where
           , "dispatcher" .=
             table [ "bind" .= _nc_dispatcher_bind
                   , "connect" .= _nc_dispatcher_connect
+                  , "send_timeout_ms" .= _nc_dispatcher_send_timeout_ms
                   , "throttle" .= _nc_dispatcher_throttle_ms ]
           ]

src/Gargantext/Core/Notifications/Dispatcher.hs

@@ -88,7 +88,7 @@ dispatcherListener config subscriptions = do
     -- theory, the worker can perform things like user authentication,
     -- DB queries etc so it can be slow sometimes.
     Async.withAsync (throttle (_nc_dispatcher_throttle_ms * 1000) throttleTChan
-                     (sendDataMessageThrottled log_cfg)) $ \_ -> do
+                     (sendDataMessageThrottled nc log_cfg)) $ \_ -> do
       void $ Async.concurrently (Async.replicateConcurrently 5 $ worker tChan throttleTChan) $ do
         forever $ do
           -- putText "[dispatcher_listener] receiving"
@@ -96,7 +96,7 @@ dispatcherListener config subscriptions = do
           -- C.putStrLn $ "[dispatcher_listener] " <> r
           atomically $ TChan.writeTChan tChan r
   where
-    NotificationsConfig { _nc_dispatcher_bind, _nc_dispatcher_throttle_ms } = config ^. gc_notifications_config
+    nc@NotificationsConfig { _nc_dispatcher_bind, _nc_dispatcher_throttle_ms } = config ^. gc_notifications_config
     log_cfg = config ^. gc_logging
     worker tChan throttleTChan = withLogger log_cfg $ \ioL -> do
       tId <- myThreadId
@@ -166,21 +166,17 @@ sendNotification throttleTChan ceMessage sub = do
       atomically $ do
         TChan.writeTChan throttleTChan (id', (wsConn ws, WS.Text (Aeson.encode notification) Nothing))
 
--- | Static send timeout, in microseconds
-sendTimeoutUs :: Int
-sendTimeoutUs = 500_000
-
 -- | The "true" message sending to websocket. After it was withheld
 -- for a while (for throttling), it is finally sent here
-sendDataMessageThrottled :: LogConfig -> (WS.Connection, WS.DataMessage) -> IO ()
-sendDataMessageThrottled log_cfg (conn, msg) = do
+sendDataMessageThrottled :: NotificationsConfig -> LogConfig -> (WS.Connection, WS.DataMessage) -> IO ()
+sendDataMessageThrottled (NotificationsConfig { _nc_dispatcher_send_timeout_ms }) log_cfg (conn, msg) = do
   withLogger log_cfg $ \ioL -> do
     logMsg ioL DEBUG $ "[sendDataMessageThrottled] dispatching notification: " <> show msg
     -- | We need a timeout here for the following reason:
     --   when a message is sent and the user disconnects the WS
     --   connection (e.g. refreshes the page), it seems that this message sending hangs.
     --   We don't want to block the thread indefinitely.
-    timeoutKickedIn <- timeout sendTimeoutUs $ WS.sendDataMessage conn msg
+    timeoutKickedIn <- timeout (_nc_dispatcher_send_timeout_ms * 1000) $ WS.sendDataMessage conn msg
     case timeoutKickedIn of
       Nothing ->
           $(logLoc) ioL ERROR $ "[sendMessageThrottled] couldn't send msg in timely fashion."

test-data/test_config.toml

@@ -76,6 +76,7 @@ send_timeout_ms = 200
 [notifications.dispatcher]
 bind = ""
 connect = ""
+send_timeout_ms = 500
 throttle_ms = 500
 
 

test/Test/Database/Setup.hs

@@ -90,6 +90,7 @@ withTestNotificationConfig cfg action = do
                                           , _nc_ce_send_timeout_ms = 200
                                           , _nc_dispatcher_bind = "ipc://" <> ds_fp
                                           , _nc_dispatcher_connect = "ipc://" <> ds_fp
+                                          , _nc_dispatcher_send_timeout_ms = 500
                                           , _nc_dispatcher_throttle_ms = 500
                                           }