Skip to content

changed the worker recognizing the closure of the controller from err… #84

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ghyatzo merged 1 commit into from
Feb 17, 2025
Merged

changed the worker recognizing the closure of the controller from err… #84

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions src/buffer/worker.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ impl BufferController {

// received new change ack, merge editor branch up to that version
res = worker.ack_rx.recv() => match res {
None => break tracing::error!("ack channel closed"),
None => break tracing::debug!("stopping: ack channel closed"),
Some(v) => {
tracing::debug!("client acked change");
worker.branch.merge(&worker.oplog, &v);
Expand All @@ -126,7 +126,7 @@ impl BufferController {

// received a new poller, add it to collection
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),
},

Expand Down Expand Up @@ -213,10 +213,11 @@ impl BufferWorker {
#[tracing::instrument(skip(self))]
async fn handle_server_change(&mut self, change: BufferEvent) -> bool {
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");
true
},
}
Some(controller) => match self.oplog.decode_and_add(&change.op.data) {
Ok(local_version) => {
tracing::debug!("updating local version: {local_version:?}");
Expand Down