diff --git a/Cargo.toml b/Cargo.toml index f4d33d6..08d146a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -16,7 +16,9 @@ bb8 = "^0.8.1" config = "^0.13.3" mio = { version = "^0.8.9", default-features = false, features = ["os-poll", "os-ext", "net"] } serde_json = "^1.0.108" -sozu-command-lib = "^0.15.15" +# TODO: replace this with the sozu version release that will have protobuf in channels +# sozu-command-lib = "^0.15.15" +sozu-command-lib = { path = "../sozu/command" } tempdir = "^0.3.7" thiserror = "^1.0.50" tokio = { version = "^1.34.0", features = ["time", "fs", "io-util"] } diff --git a/src/channel.rs b/src/channel.rs index 700b360..3363680 100644 --- a/src/channel.rs +++ b/src/channel.rs @@ -35,8 +35,8 @@ pub enum Error { #[derive(PartialEq, Eq, Clone, Debug)] pub struct ConnectionProperties { pub socket: PathBuf, - pub buffer_size: usize, - pub max_buffer_size: usize, + pub buffer_size: u64, + pub max_buffer_size: u64, } impl From<&Config> for ConnectionProperties { @@ -63,7 +63,7 @@ impl TryFrom<&PathBuf> for ConnectionProperties { impl ConnectionProperties { #[tracing::instrument] - fn new(socket: PathBuf, buffer_size: usize, max_buffer_size: usize) -> Self { + fn new(socket: PathBuf, buffer_size: u64, max_buffer_size: u64) -> Self { Self { socket, buffer_size, diff --git a/src/lib.rs b/src/lib.rs index 13e81c7..9e75e2f 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -6,8 +6,7 @@ use bb8::Pool; use sozu_command_lib::{ channel::ChannelError, - proto::command::{request::RequestType, Request, Response, ResponseStatus}, - request::WorkerRequest, + proto::command::{request::RequestType, Request, Response, ResponseStatus, WorkerRequest}, }; use tempdir::TempDir; use tokio::{