diff --git a/Cargo.toml b/Cargo.toml index b6c9191..4efbeb8 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -10,7 +10,7 @@ name = "codemp" # core tracing = "0.1" # woot -codemp-woot = { git = "ssh://git@github.com/codewithotherpeopleandchangenamelater/woot.git", branch = "dev", optional = true } +codemp-woot = { git = "ssh://git@github.com/codewithotherpeopleandchangenamelater/woot.git", rev = "f971807c742579e0e89eb7ee4330f7b2edcc35c7", optional = true } # proto tonic = { version = "0.9", features = ["tls", "tls-roots"], optional = true } prost = { version = "0.11.8", optional = true } diff --git a/src/buffer/controller.rs b/src/buffer/controller.rs index 17d356c..fd44772 100644 --- a/src/buffer/controller.rs +++ b/src/buffer/controller.rs @@ -5,7 +5,7 @@ use std::sync::Arc; -use tokio::sync::{watch, mpsc, Mutex, RwLock, TryLockError}; +use tokio::sync::{watch, mpsc, RwLock}; use tonic::async_trait; use crate::errors::IgnorableError; diff --git a/src/buffer/worker.rs b/src/buffer/worker.rs index 67b802e..a8f7aa1 100644 --- a/src/buffer/worker.rs +++ b/src/buffer/worker.rs @@ -43,7 +43,7 @@ impl BufferControllerWorker { operations: op_rx, receiver: txt_rx, sender: op_tx, - buffer: Woot::new(site_id, ""), // TODO initialize with buffer! + buffer: Woot::new(site_id % (2<<10), ""), // TODO remove the modulo, only for debugging! path: path.to_string(), stop: end_rx, stop_control: end_tx, @@ -123,7 +123,7 @@ impl ControllerWorker for BufferControllerWorker { match self.send_op(&mut tx, &op).await { Err(e) => tracing::error!("server refused to broadcast {}: {}", op, e), Ok(()) => { - self.content.send(self.buffer.view()).unwrap_or_warn("could not send buffer update"); + // self.content.send(self.buffer.view()).unwrap_or_warn("could not send buffer update"); }, } }