Skip to content

fix: avoid panic when filesystem watcher hits permission errors #2929

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

Open
leno23 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: avoid panic when filesystem watcher hits permission errors #2929

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
44 changes: 32 additions & 12 deletions src/watcher.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,15 +49,20 @@ impl RepoWatcher {
loop {
let ev = receiver.recv()?;

if let Ok(ev) = ev {
log::debug!("notify events: {}", ev.len());
match ev {
Ok(events) => {
log::debug!("notify events: {}", events.len());

for (idx, ev) in ev.iter().enumerate() {
log::debug!("notify [{idx}]: {ev:?}");
}
for (idx, event) in events.iter().enumerate() {
log::debug!("notify [{idx}]: {event:?}");
}

if !ev.is_empty() {
sender.send(())?;
if !events.is_empty() {
sender.send(())?;
}
}
Err(e) => {
log::warn!("notify debouncer error: {e}");
}
}
}
Expand All @@ -71,12 +76,27 @@ fn create_watcher(
) {
scope_time!("create_watcher");

let mut bouncer =
new_debouncer(timeout, tx).expect("Watch create error");
bouncer
let mut bouncer = match new_debouncer(timeout, tx) {
Ok(bouncer) => bouncer,
Err(e) => {
log::warn!(
"failed to create filesystem watcher: {e}; \
file change notifications disabled"
);
return;
}
};

if let Err(e) = bouncer
.watcher()
.watch(Path::new(&workdir), RecursiveMode::Recursive)
.expect("Watch error");
.watch(Path::new(workdir), RecursiveMode::Recursive)
{
log::warn!(
"failed to watch repository for changes ({e}); \
file change notifications disabled"
);
return;
}

std::mem::forget(bouncer);
}