Skip to content

Commit

Permalink
Revert "deps(rust): update notify-debouncer-full requirement from 0.3…
Browse files Browse the repository at this point in the history
… to 0.4"

This reverts commit 5d5b593.

The latest version of notify-debouncer-full
caused himmelblaud to get stuck in a runaway loop
reprocesing /etc/passwd over and over again,
checking for local users/groups. Reverting this
broken version and pegging the version to 0.3.

Signed-off-by: David Mulder <[email protected]>
  • Loading branch information
dmulder committed Nov 8, 2024
1 parent 7644687 commit cf427ce
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 4 deletions.
1 change: 1 addition & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,5 +20,6 @@ updates:
- dependency-name: "opentelemetry-stdout"
- dependency-name: "tracing-opentelemetry"
- dependency-name: "utoipa"
- dependency-name: "notify-debouncer-full"
# This requires an update to compact-jwt first, awaiting that update
- dependency-name: "kanidm-hsm-crypto"
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ kanidm_lib_crypto = { path = "./src/crypto" }
kanidm_utils_users = { path = "./src/users" }
walkdir = "2"
csv = "1.2.2"
notify-debouncer-full = { version = "0.4" }
notify-debouncer-full = { version = ">=0.3, <0.4" }
utoipa = "4.2.0"
utoipa-swagger-ui = "4.0.0"
opentelemetry = { version = "0.20.0" }
Expand Down
6 changes: 3 additions & 3 deletions src/daemon/src/daemon.rs
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ use tokio_util::codec::{Decoder, Encoder, Framed};

use kanidm_hsm_crypto::{soft::SoftTpm, AuthValue, BoxedDynTpm, Tpm};

use notify_debouncer_full::{new_debouncer, notify::RecursiveMode};
use notify_debouncer_full::{new_debouncer, notify::RecursiveMode, notify::Watcher};

mod broker;
use broker::Broker;
Expand Down Expand Up @@ -1051,10 +1051,10 @@ async fn main() -> ExitCode {
let _ = inotify_tx.try_send(true);
})
.and_then(|mut debouncer| {
debouncer.watch(Path::new("/etc/passwd"), RecursiveMode::NonRecursive)
debouncer.watcher().watch(Path::new("/etc/passwd"), RecursiveMode::NonRecursive)
.map(|()| debouncer)
})
.and_then(|mut debouncer| debouncer.watch(Path::new("/etc/group"), RecursiveMode::NonRecursive)
.and_then(|mut debouncer| debouncer.watcher().watch(Path::new("/etc/group"), RecursiveMode::NonRecursive)
.map(|()| debouncer)
)

Expand Down

0 comments on commit cf427ce

Please sign in to comment.