From dcde0e26e478e695c083820447b11c3c206944b4 Mon Sep 17 00:00:00 2001 From: Ellie Huxtable Date: Wed, 28 Jan 2026 13:46:51 -0800 Subject: feat: move atuin-server to its own binary (#3112) A combined binary was an early dev decision, when I thought most users would be self hosting. It is now clear that in actual fact, most users do not self host. So let's avoid forcing every user to have a copy of the server literally linked in, and let's stop building server deps over and over. The deployment for this shouldn't change. `dist` will build a binary for this automatically, and will also add it to the installer. The latter is perhaps something we should explore changing too! ## Checks - [ ] I am happy for maintainers to push small adjustments to this PR, to speed up the review cycle - [ ] I have checked that there are no existing pull requests for the same thing --- crates/atuin-server/src/bin/main.rs | 73 +++++++++++++++++++++++++++++++++++++ 1 file changed, 73 insertions(+) create mode 100644 crates/atuin-server/src/bin/main.rs (limited to 'crates/atuin-server/src') diff --git a/crates/atuin-server/src/bin/main.rs b/crates/atuin-server/src/bin/main.rs new file mode 100644 index 00000000..960bdf6e --- /dev/null +++ b/crates/atuin-server/src/bin/main.rs @@ -0,0 +1,73 @@ +#![forbid(unsafe_code)] + +use std::net::SocketAddr; + +use atuin_server::{Settings, example_config, launch, launch_metrics_server}; +use atuin_server_database::DbType; +use atuin_server_postgres::Postgres; +use atuin_server_sqlite::Sqlite; + +use clap::Parser; +use eyre::{Context, Result, eyre}; +use tracing_subscriber::{EnvFilter, fmt, prelude::*}; + +#[derive(Parser, Debug)] +#[clap( + name = "atuin-server", + about = "Atuin sync server", + version, + infer_subcommands = true +)] +enum Cmd { + /// Start the server + Start { + /// The host address to bind + #[clap(long)] + host: Option, + + /// The port to bind + #[clap(long, short)] + port: Option, + }, + + /// Print server example configuration + DefaultConfig, +} + +#[tokio::main] +async fn main() -> Result<()> { + let cmd = Cmd::parse(); + + tracing_subscriber::registry() + .with(fmt::layer()) + .with(EnvFilter::from_default_env()) + .init(); + + tracing::trace!(command = ?cmd, "server command"); + + match cmd { + Cmd::Start { host, port } => { + let settings = Settings::new().wrap_err("could not load server settings")?; + let host = host.as_ref().unwrap_or(&settings.host).clone(); + let port = port.unwrap_or(settings.port); + let addr = SocketAddr::new(host.parse()?, port); + + if settings.metrics.enable { + tokio::spawn(launch_metrics_server( + settings.metrics.host.clone(), + settings.metrics.port, + )); + } + + match settings.db_settings.db_type() { + DbType::Postgres => launch::(settings, addr).await, + DbType::Sqlite => launch::(settings, addr).await, + DbType::Unknown => Err(eyre!("db_uri must start with postgres:// or sqlite://")), + } + } + Cmd::DefaultConfig => { + println!("{}", example_config()); + Ok(()) + } + } +} -- cgit v1.3.1