Skip to content

Commit

Permalink
switch to protobuf channel
Browse files Browse the repository at this point in the history
update rust-toolchain and rust version to 1.74.0
  • Loading branch information
Keksoj committed Mar 12, 2024
1 parent fc2e059 commit 8e989a7
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 9 deletions.
4 changes: 3 additions & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,9 @@ bb8 = "^0.8.1"
config = "^0.13.4"
mio = { version = "^0.8.10", default-features = false, features = ["os-poll", "os-ext", "net"] }
serde_json = "^1.0.111"
sozu-command-lib = "^0.15.19"
# TODO: replace this with the sozu version release that will have protobuf in channels
# sozu-command-lib = "^0.15.19"
sozu-command-lib = { path = "../sozu/command" }
tempdir = "^0.3.7"
thiserror = "^1.0.56"
tokio = { version = "^1.35.1", features = ["time", "fs", "io-util"] }
Expand Down
2 changes: 1 addition & 1 deletion rust-toolchain
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.70.0
1.74.0
6 changes: 3 additions & 3 deletions src/channel.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -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,
Expand Down
3 changes: 1 addition & 2 deletions src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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::{
Expand Down
3 changes: 1 addition & 2 deletions src/unpooled.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,7 @@
use sozu_command_lib::{
channel::{Channel, ChannelError},
proto::command::{request::RequestType, Request, Response, ResponseStatus},
request::WorkerRequest,
proto::command::{request::RequestType, Request, Response, ResponseStatus, WorkerRequest},
};
use tempdir::TempDir;
use tokio::{
Expand Down

0 comments on commit 8e989a7

Please sign in to comment.