diff --git a/Cargo.lock b/Cargo.lock index 19a9ad5e..f0ba3918 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1670,6 +1670,21 @@ dependencies = [ "zerocopy", ] +[[package]] +name = "praxis" +version = "0.1.0" +dependencies = [ + "clap", + "nix", + "praxis-proxy-core", + "praxis-proxy-filter", + "praxis-proxy-protocol", + "tikv-jemallocator", + "tokio", + "tokio-util", + "tracing", +] + [[package]] name = "praxis-proxy-core" version = "0.1.0" @@ -1727,21 +1742,6 @@ dependencies = [ "tracing", ] -[[package]] -name = "praxis-proxy-server" -version = "0.1.0" -dependencies = [ - "clap", - "nix", - "praxis-proxy-core", - "praxis-proxy-filter", - "praxis-proxy-protocol", - "tikv-jemallocator", - "tokio", - "tokio-util", - "tracing", -] - [[package]] name = "praxis-proxy-tls" version = "0.1.0" @@ -1762,10 +1762,10 @@ version = "0.1.0" dependencies = [ "h2", "http", + "praxis", "praxis-proxy-core", "praxis-proxy-filter", "praxis-proxy-protocol", - "praxis-proxy-server", "rcgen", "rustls", "rustls-pemfile", @@ -1831,10 +1831,10 @@ dependencies = [ "async-trait", "benchmarks", "bytes", + "praxis", "praxis-proxy-core", "praxis-proxy-filter", "praxis-proxy-protocol", - "praxis-proxy-server", "praxis-test-utils", "serde_yaml", "tokio", @@ -1854,8 +1854,8 @@ dependencies = [ name = "praxis-tests-smoke" version = "0.1.0" dependencies = [ + "praxis", "praxis-proxy-core", - "praxis-proxy-server", "praxis-test-utils", ] @@ -3150,8 +3150,8 @@ dependencies = [ "clap", "nix", "plotters", + "praxis", "praxis-proxy-core", - "praxis-proxy-server", "serde", "serde_json", "serde_yaml", diff --git a/Cargo.toml b/Cargo.toml index ad8ef7d1..ed1819fe 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -51,7 +51,7 @@ pingora-http = { version = "0.8.0", git = "https://github.com/praxis-proxy/pingo pingora-proxy = { version = "0.8.0", git = "https://github.com/praxis-proxy/pingora.git", rev = "b2fa2c9a8d4074e2a2a42e70ab4c17f8c61a566d", features = ["rustls"] } percent-encoding = "2.3.2" plotters = { version = "0.3.7", default-features = false, features = ["svg_backend", "line_series"] } -praxis = { path = "server", package = "praxis-proxy-server" } +praxis = { path = "server" } praxis-core = { version = "0.1.0", path = "core", package = "praxis-proxy-core" } praxis-filter = { version = "0.1.0", path = "filter", package = "praxis-proxy-filter" } praxis-protocol = { version = "0.1.0", path = "protocol", package = "praxis-proxy-protocol" } diff --git a/Containerfile b/Containerfile index 87401ff8..ca0c00a7 100644 --- a/Containerfile +++ b/Containerfile @@ -45,7 +45,7 @@ RUN mkdir -p core/src \ RUN --mount=type=cache,target=/usr/local/cargo/registry \ --mount=type=cache,target=/src/target \ - cargo build --release -p praxis-proxy-server + cargo build --release -p praxis # ------------------------------------------------------------------------------ # Cache Tricks @@ -72,7 +72,7 @@ RUN find core/src filter/src \ RUN --mount=type=cache,target=/usr/local/cargo/registry \ --mount=type=cache,target=/src/target \ - cargo build --release -p praxis-proxy-server \ + cargo build --release -p praxis \ && cp target/release/praxis /usr/local/bin/praxis # ------------------------------------------------------------------------------ diff --git a/Makefile b/Makefile index 77138b9d..f33dc227 100644 --- a/Makefile +++ b/Makefile @@ -67,7 +67,7 @@ test-unit: cargo test -p praxis-proxy-core $(_NOCAPTURE) cargo test -p praxis-proxy-filter $(_NOCAPTURE) cargo test -p praxis-proxy-protocol $(_NOCAPTURE) - cargo test -p praxis-proxy-server $(_NOCAPTURE) + cargo test -p praxis $(_NOCAPTURE) test-configuration: cargo test -p praxis-tests-configuration $(_NOCAPTURE) diff --git a/server/Cargo.toml b/server/Cargo.toml index ee36cd3e..48ad3958 100644 --- a/server/Cargo.toml +++ b/server/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "praxis-proxy-server" +name = "praxis" version.workspace = true edition.workspace = true rust-version.workspace = true diff --git a/xtask/src/benchmark/flamegraph.rs b/xtask/src/benchmark/flamegraph.rs index efe76bbb..e9122e4e 100644 --- a/xtask/src/benchmark/flamegraph.rs +++ b/xtask/src/benchmark/flamegraph.rs @@ -93,7 +93,7 @@ fn require_tool(name: &str, hint: &str) { /// Build the profiling binary and return its path. fn build_profiling_binary() -> PathBuf { let status = Command::new("cargo") - .args(["build", "--profile", "profiling", "-p", "praxis-proxy-server"]) + .args(["build", "--profile", "profiling", "-p", "praxis"]) .env("RUSTFLAGS", "-C force-frame-pointers=yes") .status() .expect("failed to run cargo build");