isolate method ConfigState::list_listeners

sozu-proxy · May 19, 2023 · 9085a20 · 9085a20
1 parent c85f65f
commit 9085a20
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 11 deletions.
diff --git a/bin/src/command/requests.rs b/bin/src/command/requests.rs
@@ -19,9 +19,9 @@ use sozu_command_lib::{
     parser::parse_several_commands,
     proto::command::{
         request::RequestType, response_content::ContentType, AggregatedMetrics, AvailableMetrics,
-        ClusterHashes, ClusterInformations, FrontendFilters, ListenersList,
-        MetricsConfiguration, Request, Response, ResponseContent, ResponseStatus,
-        ReturnListenSockets, RunState, SoftStop, Status, WorkerInfo, WorkerInfos, WorkerResponses,
+        ClusterHashes, ClusterInformations, FrontendFilters, MetricsConfiguration, Request,
+        Response, ResponseContent, ResponseStatus, ReturnListenSockets, RunState, SoftStop, Status,
+        WorkerInfo, WorkerInfos, WorkerResponses,
     },
     request::WorkerRequest,
     scm_socket::Listeners,
@@ -346,13 +346,10 @@ impl CommandServer {
     }
 
     fn list_listeners(&self) -> anyhow::Result<Option<Success>> {
+        let listeners_list = self.state.list_listeners();
+
         Ok(Some(Success::ListListeners(
-            ContentType::ListenersList(ListenersList {
-                http_listeners: self.state.http_listeners.clone(),
-                https_listeners: self.state.https_listeners.clone(),
-                tcp_listeners: self.state.tcp_listeners.clone(),
-            })
-            .into(),
+            ContentType::ListenersList(listeners_list).into(),
         )))
     }
 

diff --git a/command/src/state.rs b/command/src/state.rs
@@ -15,8 +15,8 @@ use crate::{
     proto::command::{
         request::RequestType, ActivateListener, AddBackend, AddCertificate, CertificateAndKey,
         CertificateWithNames, Cluster, ClusterInformation, DeactivateListener, FrontendFilters,
-        HttpListenerConfig, HttpsListenerConfig, ListedFrontends, ListenerType, PathRule,
-        RemoveBackend, RemoveCertificate, RemoveListener, ReplaceCertificate, Request,
+        HttpListenerConfig, HttpsListenerConfig, ListedFrontends, ListenerType, ListenersList,
+        PathRule, RemoveBackend, RemoveCertificate, RemoveListener, ReplaceCertificate, Request,
         RequestHttpFrontend, RequestTcpFrontend, TcpListenerConfig,
     },
     response::{Backend, HttpFrontend, TcpFrontend},
@@ -1281,6 +1281,14 @@ impl ConfigState {
 
         listed_frontends
     }
+
+    pub fn list_listeners(&self) -> ListenersList {
+        ListenersList {
+            http_listeners: self.http_listeners.clone(),
+            https_listeners: self.https_listeners.clone(),
+            tcp_listeners: self.tcp_listeners.clone(),
+        }
+    }
 }
 
 fn domain_check(