hexedtech/codemp
3
0
Fork 0
mirror of https://github.com/hexedtech/codemp.git synced 2025-03-29 22:51:34 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request from hexedtech/fix/fix-worker-stopping-pr

Browse source 
changed the worker recognizing the closure of the controller from err…
This commit is contained in:
cschen 2025-02-17 23:29:13 +01:00 • committed by GitHub
commit 05073972bf
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 5 additions and 4 deletions

9
src/buffer/worker.rs
View file

@ -115,7 +115,7 @@ impl BufferController {
// received new change ack, merge editor branch up to that version // received new change ack, merge editor branch up to that version
res = worker.ack_rx.recv() => match res { res = worker.ack_rx.recv() => match res {
None => break tracing::error!("ack channel closed"), None => break tracing::debug!("stopping: ack channel closed"),
Some(v) => { Some(v) => {
tracing::debug!("client acked change"); tracing::debug!("client acked change");
worker.branch.merge(&worker.oplog, &v); worker.branch.merge(&worker.oplog, &v);
@ -126,7 +126,7 @@ impl BufferController {
// received a new poller, add it to collection // received a new poller, add it to collection
res = worker.poller.recv() => match res { res = worker.poller.recv() => match res {
None => break tracing::error!("poller channel closed"), None => break tracing::debug!("stopping: poller channel closed"),
Some(tx) => worker.pollers.push(tx), Some(tx) => worker.pollers.push(tx),
}, },
@ -213,10 +213,11 @@ impl BufferWorker {
#[tracing::instrument(skip(self))] #[tracing::instrument(skip(self))]
async fn handle_server_change(&mut self, change: BufferEvent) -> bool { async fn handle_server_change(&mut self, change: BufferEvent) -> bool {
match self.controller.upgrade() { match self.controller.upgrade() {
None => { // clean exit actually, just weird we caught it here None => {
// clean exit actually, just weird we caught it here
tracing::debug!("clean exit while handling server change"); tracing::debug!("clean exit while handling server change");
true true
}, }
Some(controller) => match self.oplog.decode_and_add(&change.op.data) { Some(controller) => match self.oplog.decode_and_add(&change.op.data) {
Ok(local_version) => { Ok(local_version) => {
tracing::debug!("updating local version: {local_version:?}"); tracing::debug!("updating local version: {local_version:?}");