make response::Event a struct, create EventKind

sozu-proxy · Apr 28, 2023 · 7fb08f3 · 7fb08f3
1 parent 7214aa2
commit 7fb08f3
Show file tree

Hide file tree

Showing 6 changed files with 55 additions and 36 deletions.
diff --git a/command/src/command.proto b/command/src/command.proto
@@ -387,7 +387,6 @@ enum MetricsConfiguration {
     CLEAR = 2;
 }
 
-
 enum ResponseStatus {
     OK = 0;
     PROCESSING = 1;

diff --git a/command/src/response.rs b/command/src/response.rs
@@ -278,17 +278,21 @@ impl fmt::Display for RunState {
     }
 }
 
-// TODO: remove the SocketAddr type
 /// a backend event that happened on a proxy
-#[derive(Debug, Clone, PartialEq, Eq, Hash, Serialize, Deserialize)]
-#[serde(tag = "type", content = "data", rename_all = "SCREAMING_SNAKE_CASE")]
-pub enum Event {
-    BackendDown(String, SocketAddr),
-    BackendUp(String, SocketAddr),
-    NoAvailableBackends(String),
-    /// indicates a backend that was removed from configuration has no lingering connections
-    /// so it can be safely stopped
-    RemovedBackendHasNoConnections(String, SocketAddr),
+#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
+pub struct Event {
+    pub kind: EventKind,
+    pub cluster_id: Option<String>,
+    pub backend_id: Option<String>,
+    pub address: Option<String>,
+}
+
+#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
+pub enum EventKind {
+    BackendDown,
+    BackendUp,
+    NoAvailableBackends,
+    RemovedBackendHasNoConnections,
 }
 
 #[derive(Serialize)]

diff --git a/lib/src/backends.rs b/lib/src/backends.rs
@@ -5,7 +5,7 @@ use mio::net::TcpStream;
 
 use sozu_command::{
     proto::command::{LoadBalancingAlgorithms, LoadMetric},
-    response::Event,
+    response::{Event, EventKind},
     state::ClusterId,
 };
 
@@ -105,7 +105,12 @@ impl BackendMap {
                 if self.available {
                     self.available = false;
 
-                    push_event(Event::NoAvailableBackends(cluster_id.to_string()));
+                    push_event(Event {
+                        kind: EventKind::NoAvailableBackends,
+                        cluster_id: Some(cluster_id.to_owned()),
+                        backend_id: None,
+                        address: None,
+                    });
                 }
                 bail!("No more backend available for cluster {}", cluster_id);
             }

diff --git a/lib/src/lib.rs b/lib/src/lib.rs
@@ -217,7 +217,7 @@ use sozu_command::{
     proto::command::{Cluster, LoadBalancingParams},
     ready::Ready,
     request::WorkerRequest,
-    response::{Event, WorkerResponse},
+    response::{Event, EventKind, WorkerResponse},
     state::ClusterId,
 };
 use time::{Duration, Instant};
@@ -716,10 +716,12 @@ impl Backend {
 // can be safely stopped
 impl std::ops::Drop for Backend {
     fn drop(&mut self) {
-        server::push_event(Event::RemovedBackendHasNoConnections(
-            self.backend_id.clone(),
-            self.address,
-        ));
+        server::push_event(Event {
+            kind: EventKind::RemovedBackendHasNoConnections,
+            backend_id: Some(self.backend_id.clone()),
+            address: Some(self.address.to_string()),
+            cluster_id: None,
+        });
     }
 }
 

diff --git a/lib/src/protocol/http/mod.rs b/lib/src/protocol/http/mod.rs
@@ -14,7 +14,7 @@ use std::{
 use anyhow::{bail, Context};
 use mio::{net::TcpStream, *};
 use rusty_ulid::Ulid;
-use sozu_command::response::Event;
+use sozu_command::response::{Event, EventKind};
 use time::{Duration, Instant};
 
 use crate::{
@@ -2220,10 +2220,12 @@ impl<Front: SocketHandler, L: ListenerHandler + L7ListenerHandler> Http<Front, L
                         backend.backend_id, backend.address
                     );
 
-                    push_event(Event::BackendUp(
-                        backend.backend_id.clone(),
-                        backend.address,
-                    ));
+                    push_event(Event {
+                        kind: EventKind::BackendUp,
+                        backend_id: Some(backend.backend_id.to_owned()),
+                        address: Some(backend.address.to_string()),
+                        cluster_id: None,
+                    });
                 }
 
                 if let BackendConnectionStatus::Connecting(start) = last {
@@ -2261,10 +2263,12 @@ impl<Front: SocketHandler, L: ListenerHandler + L7ListenerHandler> Http<Front, L
                     metrics.backend_id.as_deref()
                 );
 
-                push_event(Event::BackendDown(
-                    backend.backend_id.clone(),
-                    backend.address,
-                ));
+                push_event(Event {
+                    kind: EventKind::BackendDown,
+                    backend_id: Some(backend.backend_id.to_owned()),
+                    address: Some(backend.address.to_string()),
+                    cluster_id: None,
+                });
             }
         }
     }

diff --git a/lib/src/tcp.rs b/lib/src/tcp.rs
@@ -16,9 +16,10 @@ use mio::{
 };
 use rusty_ulid::Ulid;
 use slab::Slab;
-use sozu_command::proto::command::request::RequestType;
 use time::{Duration, Instant};
 
+use sozu_command::{proto::command::request::RequestType, response::EventKind};
+
 use crate::{
     backends::BackendMap,
     pool::{Checkout, Pool},
@@ -504,10 +505,12 @@ impl TcpSession {
                         "backend server {} at {} is up",
                         backend.backend_id, backend.address
                     );
-                    push_event(Event::BackendUp(
-                        backend.backend_id.clone(),
-                        backend.address,
-                    ));
+                    push_event(Event {
+                        kind: EventKind::BackendUp,
+                        backend_id: Some(backend.backend_id.to_owned()),
+                        address: Some(backend.address.to_string()),
+                        cluster_id: None,
+                    });
                 }
 
                 if let BackendConnectionStatus::Connecting(start) = last {
@@ -556,10 +559,12 @@ impl TcpSession {
                     self.metrics.backend_id.as_deref()
                 );
 
-                push_event(Event::BackendDown(
-                    backend.backend_id.clone(),
-                    backend.address,
-                ));
+                push_event(Event {
+                    kind: EventKind::BackendDown,
+                    backend_id: Some(backend.backend_id.to_owned()),
+                    address: Some(backend.address.to_string()),
+                    cluster_id: None,
+                });
             }
         }
     }