feat(console): add deployment-routed gateway
- persist service-to-revision deployments in libSQL with an additive migration - restore active actors and atomically switch revisions - expose an isolated raw-byte gateway on a second listener with stable errors - cover routing, isolation, revision switching, and restart restoration
This commit is contained in:
@@ -1,11 +1,11 @@
|
||||
//! Standalone Wasmeld management server entry point.
|
||||
//! Standalone Wasmeld control-plane and data-plane server entry point.
|
||||
|
||||
use std::{env, net::SocketAddr, path::PathBuf, sync::Arc};
|
||||
|
||||
use axum::http::HeaderValue;
|
||||
use tracing::info;
|
||||
use tracing_subscriber::EnvFilter;
|
||||
use wasmeld_console::{Console, ConsoleConfig, app};
|
||||
use wasmeld_console::{Console, ConsoleConfig, app, gateway_app};
|
||||
|
||||
#[tokio::main]
|
||||
async fn main() -> Result<(), Box<dyn std::error::Error>> {
|
||||
@@ -16,9 +16,12 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
|
||||
)
|
||||
.init();
|
||||
|
||||
let address = env::var("WASMELD_ADDR")
|
||||
let management_address = env::var("WASMELD_ADDR")
|
||||
.unwrap_or_else(|_| "127.0.0.1:8080".to_owned())
|
||||
.parse::<SocketAddr>()?;
|
||||
let gateway_address = env::var("WASMELD_GATEWAY_ADDR")
|
||||
.unwrap_or_else(|_| "0.0.0.0:8081".to_owned())
|
||||
.parse::<SocketAddr>()?;
|
||||
let artifact_dir = env::var_os("WASMELD_ARTIFACT_DIR")
|
||||
.map(PathBuf::from)
|
||||
.unwrap_or_else(|| PathBuf::from("var/wasmeld/components"));
|
||||
@@ -38,13 +41,26 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
|
||||
})
|
||||
.await?,
|
||||
);
|
||||
let application = app(console, allowed_origins);
|
||||
let listener = tokio::net::TcpListener::bind(address).await?;
|
||||
let management = app(Arc::clone(&console), allowed_origins);
|
||||
let gateway = gateway_app(console);
|
||||
let management_listener = tokio::net::TcpListener::bind(management_address).await?;
|
||||
let gateway_listener = tokio::net::TcpListener::bind(gateway_address).await?;
|
||||
let (shutdown_sender, shutdown_receiver) = tokio::sync::watch::channel(false);
|
||||
let signal_task = tokio::spawn(async move {
|
||||
shutdown_signal().await;
|
||||
let _ = shutdown_sender.send(true);
|
||||
});
|
||||
|
||||
info!(%address, "Wasmeld listening");
|
||||
axum::serve(listener, application)
|
||||
.with_graceful_shutdown(shutdown_signal())
|
||||
.await?;
|
||||
info!(%management_address, "Wasmeld management API listening");
|
||||
info!(%gateway_address, "Wasmeld Gateway listening");
|
||||
let result = tokio::try_join!(
|
||||
axum::serve(management_listener, management)
|
||||
.with_graceful_shutdown(wait_for_shutdown(shutdown_receiver.clone())),
|
||||
axum::serve(gateway_listener, gateway)
|
||||
.with_graceful_shutdown(wait_for_shutdown(shutdown_receiver)),
|
||||
);
|
||||
signal_task.abort();
|
||||
result?;
|
||||
Ok(())
|
||||
}
|
||||
|
||||
@@ -63,3 +79,11 @@ async fn shutdown_signal() {
|
||||
tracing::warn!("failed to install Ctrl+C handler");
|
||||
}
|
||||
}
|
||||
|
||||
async fn wait_for_shutdown(mut receiver: tokio::sync::watch::Receiver<bool>) {
|
||||
while !*receiver.borrow() {
|
||||
if receiver.changed().await.is_err() {
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user