hexedtech/codemp
3
0
Fork 0
mirror of https://github.com/hexedtech/codemp.git synced 2024-11-25 08:34:47 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

chore: at least log ignored errors

Browse source
This commit is contained in:
əlemi 2023-04-19 19:18:31 +02:00
parent a843cf6cb9
commit 3e95ff9971
1 changed files with 19 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/lib/operation/processor.rs
View file

@ -2,6 +2,7 @@ use std::{sync::Mutex, collections::VecDeque};
use operational_transform::{OperationSeq, OTError}; use operational_transform::{OperationSeq, OTError};
use tokio::sync::watch; use tokio::sync::watch;
use tracing::warn;
use crate::operation::factory::OperationFactory; use crate::operation::factory::OperationFactory;
@ -47,6 +48,16 @@ impl OperationFactory for OperationController {
} }
} }
/// TODO properly handle errors rather than sinking them all in here!
fn ignore_and_log<T, E : std::fmt::Display>(x: Result<T, E>, msg: &str) {
match x {
Ok(_) => {},
Err(e) => {
warn!("ignored error {}: {}", msg, e);
}
}
}
#[tonic::async_trait] #[tonic::async_trait]
impl OperationProcessor for OperationController { impl OperationProcessor for OperationController {
async fn apply(&self, op: OperationSeq) -> Result<String, OTError> { async fn apply(&self, op: OperationSeq) -> Result<String, OTError> {
@ -54,14 +65,15 @@ impl OperationProcessor for OperationController {
let res = op.apply(&txt)?; let res = op.apply(&txt)?;
*self.text.lock().unwrap() = res.clone(); *self.text.lock().unwrap() = res.clone();
self.queue.lock().unwrap().push_back(op.clone()); self.queue.lock().unwrap().push_back(op.clone());
self.notifier.send(op); ignore_and_log(self.notifier.send(op), "notifying of applied change");
Ok(res) Ok(res)
} }
async fn wait(&self) { async fn wait(&self) {
let mut blocker = self.changed.lock().unwrap().clone(); let mut blocker = self.changed.lock().unwrap().clone();
blocker.changed().await; // TODO less jank way
blocker.changed().await; ignore_and_log(blocker.changed().await, "waiting for changed content #1");
ignore_and_log(blocker.changed().await, "waiting for changed content #2");
} }
async fn process(&self, mut op: OperationSeq) -> Result<String, OTError> { async fn process(&self, mut op: OperationSeq) -> Result<String, OTError> {
@ -72,7 +84,7 @@ impl OperationProcessor for OperationController {
let txt = self.content(); let txt = self.content();
let res = op.apply(&txt)?; let res = op.apply(&txt)?;
*self.text.lock().unwrap() = res.clone(); *self.text.lock().unwrap() = res.clone();
self.changed_notifier.send(()); ignore_and_log(self.changed_notifier.send(()), "notifying of changed content");
Ok(res) Ok(res)
} }
@ -80,9 +92,9 @@ impl OperationProcessor for OperationController {
let len = self.queue.lock().unwrap().len(); let len = self.queue.lock().unwrap().len();
if len <= 0 { if len <= 0 {
let mut recv = self.last.lock().unwrap().clone(); let mut recv = self.last.lock().unwrap().clone();
// TODO this is not 100% reliable // TODO less jank way
recv.changed().await; // acknowledge current state ignore_and_log(recv.changed().await, "wairing for op changes #1"); // acknowledge current state
recv.changed().await; // wait for a change in state ignore_and_log(recv.changed().await, "wairing for op changes #2"); // wait for a change in state
} }
Some(self.queue.lock().unwrap().get(0)?.clone()) Some(self.queue.lock().unwrap().get(0)?.clone())
} }