hexedtech/codemp-vscode
3
0
Fork 0
mirror of https://github.com/hexedtech/codemp-vscode.git synced 2024-12-23 05:54:51 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: better error handling

Browse source
This commit is contained in:
əlemi 2023-04-12 00:33:14 +02:00
parent dd0acdad2f
commit c1b7073e89
2 changed files with 16 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/server/buffer/actor.rs
View file

@ -1,6 +1,6 @@
use codemp::proto::{RawOp, OperationRequest};
use tokio::sync::{mpsc, broadcast, watch};
use tracing::error;
use tracing::{error, warn};
use md5::Digest;
use operational_transform::OperationSeq;
@ -69,23 +69,27 @@ impl BufferWorker {
async fn work(mut self) {
loop {
match self.edits.recv().await {
None => break,
Some(v) => {
let op : OperationSeq = serde_json::from_str(&v.opseq).unwrap();
match op.apply(&self.store) {
None => break warn!("channel closed"),
Some(v) => match serde_json::from_str::<OperationSeq>(&v.opseq) {
Err(e) => break error!("could not deserialize opseq: {}", e),
Ok(op) => match op.apply(&self.store) {
Err(e) => error!("coult not apply OpSeq '{:?}' on '{}' : {}", v, self.store, e),
Ok(res) => {
self.store = res;
self.digest.send(md5::compute(&self.store)).unwrap();
self.content.send(self.store.clone()).unwrap();
let msg = RawOp {
opseq: v.opseq,
user: v.user
};
if let Err(e) = self.digest.send(md5::compute(&self.store)) {
error!("could not update digest: {}", e);
}
if let Err(e) = self.content.send(self.store.clone()) {
error!("could not update content: {}", e);
}
if let Err(e) = self.events.send(msg) {
error!("could not broadcast OpSeq: {}", e);
}
},
Err(e) => error!("coult not apply OpSeq '{:?}' on '{}' : {}", v, self.store, e),
}
},
}

6
src/server/buffer/service.rs
View file

@ -77,8 +77,10 @@ impl Buffer for BufferService {
None => return Err(Status::not_found("path not found")),
};
info!("sending edit to buffer: {}", request.opseq);
tx.send(request).await.unwrap();
Ok(Response::new(BufferResponse { accepted: true, content: None }))
match tx.send(request).await {
Ok(()) => Ok(Response::new(BufferResponse { accepted: true, content: None })),
Err(e) => Err(Status::internal(format!("error sending edit to buffer actor: {}", e))),
}
}
async fn create(&self, req:Request<BufferPayload>) -> Result<Response<BufferResponse>, Status> {