refactor: add timeout conf for server

benches/bench.rs

@@ -102,6 +102,7 @@ fn location_filter(c: &mut Criterion) {
         Upstream::new(
             upstream_name,
             &UpstreamConf {
+                addrs: vec!["127.0.0.1:8001".to_string()],
                 ..Default::default()
             },
         )
@@ -167,6 +168,7 @@ fn location_rewrite_path(c: &mut Criterion) {
         Upstream::new(
             upstream_name,
             &UpstreamConf {
+                addrs: vec!["127.0.0.1:8001".to_string()],
                 ..Default::default()
             },
         )

conf/pingap.toml

@@ -22,6 +22,13 @@ threads = 1
 # Allow work stealing between threads of the same service. Default `true`.
 work_stealing = true
 
+# Grace period in seconds before starting the final step of the graceful shutdown after signaling shutdown.
+# Default `5m`.
+grace_period = "3m"
+
+# Timeout in seconds of the final step for the graceful shutdown. Default `5s`.
+graceful_shutdown_timeout = "10s"
+
 
 # Upsteam config list, it will defined as [upstreams.name]
 [upstreams.charts]

src/config/load.rs

@@ -213,6 +213,12 @@ pub struct PingapConf {
     pub threads: Option<usize>,
     pub work_stealing: Option<bool>,
     pub created_at: Option<String>,
+    #[serde(default)]
+    #[serde(with = "humantime_serde")]
+    pub grace_period: Option<Duration>,
+    #[serde(default)]
+    #[serde(with = "humantime_serde")]
+    pub graceful_shutdown_timeout: Option<Duration>,
 }
 
 impl PingapConf {
@@ -248,6 +254,12 @@ struct TomlConfig {
     threads: Option<usize>,
     work_stealing: Option<bool>,
     created_at: Option<String>,
+    #[serde(default)]
+    #[serde(with = "humantime_serde")]
+    pub grace_period: Option<Duration>,
+    #[serde(default)]
+    #[serde(with = "humantime_serde")]
+    pub graceful_shutdown_timeout: Option<Duration>,
 }
 
 fn format_toml(value: &Value) -> String {
@@ -326,6 +338,8 @@ pub fn load_config(path: &str, admin: bool) -> Result<PingapConf> {
         threads,
         work_stealing: data.work_stealing,
         created_at: data.created_at,
+        grace_period: data.grace_period,
+        graceful_shutdown_timeout: data.graceful_shutdown_timeout,
         ..Default::default()
     };
     for (name, value) in data.upstreams {

src/main.rs

@@ -53,6 +53,12 @@ fn new_server_conf(args: &Args, conf: &PingapConf) -> server::configuration::Ser
         error_log: args.log.clone(),
         ..Default::default()
     };
+    if let Some(value) = conf.grace_period {
+        server_conf.grace_period_seconds = Some(value.as_secs());
+    }
+    if let Some(value) = conf.graceful_shutdown_timeout {
+        server_conf.graceful_shutdown_timeout_seconds = Some(value.as_secs());
+    }
     if let Some(pid_file) = &conf.pid_file {
         server_conf.pid_file = pid_file.to_string();
     }