de-global services

Signed-off-by: Jason Volk <jason@zemos.net>
This commit is contained in:
Jason Volk 2024-07-27 07:17:07 +00:00
parent 7e50db4193
commit 2f85a5c1ac
36 changed files with 327 additions and 336 deletions

View file

@ -5,22 +5,26 @@ mod unix;
use std::sync::Arc;
use axum_server::Handle as ServerHandle;
use conduit::{Result, Server};
use conduit::Result;
use conduit_service::Services;
use tokio::sync::broadcast;
use crate::layers;
use super::layers;
/// Serve clients
pub(super) async fn serve(server: Arc<Server>, handle: ServerHandle, shutdown: broadcast::Receiver<()>) -> Result<()> {
pub(super) async fn serve(
services: Arc<Services>, handle: ServerHandle, shutdown: broadcast::Receiver<()>,
) -> Result<()> {
let server = &services.server;
let config = &server.config;
let addrs = config.get_bind_addrs();
let app = layers::build(&server)?;
let app = layers::build(&services)?;
if cfg!(unix) && config.unix_socket_path.is_some() {
unix::serve(&server, app, shutdown).await
unix::serve(server, app, shutdown).await
} else if config.tls.is_some() {
tls::serve(&server, app, handle, addrs).await
tls::serve(server, app, handle, addrs).await
} else {
plain::serve(&server, app, handle, addrs).await
plain::serve(server, app, handle, addrs).await
}
}