chore: Move network services to services flags. (#1074)

crates/test/tests/proxy.rs

@@ -109,7 +109,6 @@ trace_test!(uring_receiver, {
         ),
     }
     .spawn(pending_sends)
-    .await
     .expect("failed to spawn task");
 
     // Drop the socket, otherwise it can
@@ -161,7 +160,6 @@ trace_test!(
             &sessions,
             BUFFER_POOL.clone(),
         )
-        .await
         .unwrap();
 
         let socket = std::sync::Arc::new(sb.client());

src/cli.rs

@@ -28,7 +28,7 @@ use strum_macros::{Display, EnumString};
 
 pub use self::{
     agent::Agent, generate_config_schema::GenerateConfigSchema, manage::Manage, proxy::Proxy,
-    qcmp::Qcmp, relay::Relay,
+    qcmp::Qcmp, relay::Relay, service::Service,
 };
 
 macro_rules! define_port {
@@ -47,6 +47,7 @@ pub mod manage;
 pub mod proxy;
 pub mod qcmp;
 pub mod relay;
+mod service;
 
 const ETC_CONFIG_PATH: &str = "/etc/quilkin/quilkin.yaml";
 const PORT_ENV_VAR: &str = "QUILKIN_PORT";
@@ -121,6 +122,8 @@ pub struct Cli {
     pub admin: AdminCli,
     #[command(flatten)]
     pub locality: LocalityCli,
+    #[command(flatten)]
+    pub service: Service,
 }
 
 /// The various log format options
@@ -294,6 +297,8 @@ impl Cli {
             shutdown_tx.send(crate::ShutdownKind::Normal).ok();
         });
 
+        self.service.spawn_services(&config, &shutdown_rx)?;
+
         match (self.command, mode) {
             (Commands::Agent(agent), Admin::Agent(ready)) => {
                 agent.run(locality, config, ready, shutdown_rx).await