aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authornotgne22020-12-27 10:58:20 -0700
committernotgne22020-12-27 10:58:20 -0700
commitbbc2a2d984fc5ce3da0cbb74c4482f3953fb734e (patch)
tree4f105cd48117f33575c3b1298c1f946d76acabc3 /src
parent4461d1ea3f494778f07041164f6b8a252bd26ea2 (diff)
Use error log macro more in activate.rs
Diffstat (limited to 'src')
-rw-r--r--src/activate.rs10
1 files changed, 3 insertions, 7 deletions
diff --git a/src/activate.rs b/src/activate.rs
index b982d72..f64e069 100644
--- a/src/activate.rs
+++ b/src/activate.rs
@@ -225,11 +225,7 @@ pub async fn activation_confirmation(
Err(e) => deleted.blocking_send(Err(e)),
};
if let Err(e) = send_result {
- // We can't communicate our error, but panic-ing would
- // be bad; let's write an error and trust that the
- // activate function will realize we aren't sending
- // data.
- eprintln!("Could not send file system event to watcher: {}", e);
+ error!("Could not send file system event to watcher: {}", e);
}
})?;
watcher.watch(lock_path, RecursiveMode::Recursive)?;
@@ -243,10 +239,10 @@ pub async fn activation_confirmation(
rt.block_on(async move {
if let Err(err) = danger_zone(done, confirm_timeout).await {
if let Err(err) = deactivate(&profile_path).await {
- good_panic!("Error de-activating due to another error in confirmation thread, oh no...: {}", err);
+ error!("Error de-activating due to another error in confirmation thread, oh no...: {}", err);
}
- good_panic!("Error in confirmation thread: {}", err);
+ error!("Error in confirmation thread: {}", err);
}
});
})