Supports reuseaddr, reuseport, and configuration

rmqtt · Aug 1, 2023 · 1297c30 · 1297c30
1 parent db895e5
commit 1297c30
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 4 deletions.
diff --git a/rmqtt-plugins/rmqtt-cluster-raft/src/config.rs b/rmqtt-plugins/rmqtt-cluster-raft/src/config.rs
@@ -73,7 +73,9 @@ impl PluginConfig {
 
 #[derive(Debug, Clone, Deserialize, Serialize, Default)]
 pub struct RaftConfig {
+    #[serde(default = "RaftConfig::grpc_reuseaddr_default")]
     pub grpc_reuseaddr: bool,
+    #[serde(default = "RaftConfig::grpc_reuseport_default")]
     pub grpc_reuseport: bool,
     #[serde(default, deserialize_with = "deserialize_duration_option")]
     pub grpc_timeout: Option<Duration>,
@@ -239,6 +241,14 @@ impl RaftConfig {
         ReadOnlyOption::Safe
     }
 
+    fn grpc_reuseaddr_default() -> bool {
+        true
+    }
+
+    fn grpc_reuseport_default() -> bool {
+        false
+    }
+
     pub fn deserialize_read_only_option<'de, D>(deserializer: D) -> Result<ReadOnlyOption, D::Error>
     where
         D: Deserializer<'de>,

diff --git a/rmqtt/src/settings/mod.rs b/rmqtt/src/settings/mod.rs
@@ -146,10 +146,10 @@ pub struct Rpc {
     #[serde(default = "Rpc::server_addr_default", deserialize_with = "deserialize_addr")]
     pub server_addr: SocketAddr,
 
-    #[serde(default)]
+    #[serde(default = "Rpc::reuseaddr_default")]
     pub reuseaddr: bool,
 
-    #[serde(default)]
+    #[serde(default = "Rpc::reuseport_default")]
     pub reuseport: bool,
 
     #[serde(default = "Rpc::server_workers_default")]
@@ -170,8 +170,8 @@ impl Default for Rpc {
     #[inline]
     fn default() -> Self {
         Self {
-            reuseaddr: false,
-            reuseport: false,
+            reuseaddr: Self::reuseaddr_default(),
+            reuseport: Self::reuseport_default(),
             batch_size: Self::batch_size_default(),
             server_addr: Self::server_addr_default(),
             server_workers: Self::server_workers_default(),
@@ -182,6 +182,12 @@ impl Default for Rpc {
 }
 
 impl Rpc {
+    fn reuseaddr_default() -> bool {
+        true
+    }
+    fn reuseport_default() -> bool {
+        false
+    }
     fn batch_size_default() -> usize {
         128
     }