Duration

Author: ardatan

lib/executor/src/executors/map.rs

@@ -1,7 +1,6 @@
 use std::{
     collections::{BTreeMap, HashMap},
     sync::Arc,
-    time::Duration,
 };
 
 use bytes::{BufMut, Bytes, BytesMut};
@@ -57,9 +56,7 @@ impl SubgraphExecutorMap {
         let https = HttpsConnector::new();
         let client: HttpClient = Client::builder(TokioExecutor::new())
             .pool_timer(TokioTimer::new())
-            .pool_idle_timeout(Duration::from_secs(
-                config.traffic_shaping.pool_idle_timeout_seconds,
-            ))
+            .pool_idle_timeout(config.traffic_shaping.pool_idle_timeout)
             .pool_max_idle_per_host(config.traffic_shaping.max_connections_per_host)
             .build(https);
 

lib/router-config/src/traffic_shaping.rs

@@ -1,3 +1,5 @@
+use std::time::Duration;
+
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 
@@ -9,8 +11,13 @@ pub struct TrafficShapingConfig {
     pub max_connections_per_host: usize,
 
     /// Timeout for idle sockets being kept-alive.
-    #[serde(default = "default_pool_idle_timeout_seconds")]
-    pub pool_idle_timeout_seconds: u64,
+    #[serde(
+        default = "default_pool_idle_timeout",
+        deserialize_with = "humantime_serde::deserialize",
+        serialize_with = "humantime_serde::serialize"
+    )]
+    #[schemars(with = "String")]
+    pub pool_idle_timeout: Duration,
 
     /// Enables/disables request deduplication to subgraphs.
     ///
@@ -24,7 +31,7 @@ impl Default for TrafficShapingConfig {
     fn default() -> Self {
         Self {
             max_connections_per_host: default_max_connections_per_host(),
-            pool_idle_timeout_seconds: default_pool_idle_timeout_seconds(),
+            pool_idle_timeout: default_pool_idle_timeout(),
             dedupe_enabled: default_dedupe_enabled(),
         }
     }
@@ -34,8 +41,8 @@ fn default_max_connections_per_host() -> usize {
     100
 }
 
-fn default_pool_idle_timeout_seconds() -> u64 {
-    50
+fn default_pool_idle_timeout() -> Duration {
+    Duration::from_secs(50)
 }
 
 fn default_dedupe_enabled() -> bool {