Skip to content

Commit 037eb6c

Browse files
committed
Logging errors: remove log_cause; output details via Debug
1 parent b4079f0 commit 037eb6c

File tree

2 files changed

+4
-15
lines changed

2 files changed

+4
-15
lines changed

src/lib.rs

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -856,11 +856,9 @@ impl<R: SeedableRng> NewRng for R {
856856

857857
trace!("Seeding new RNG");
858858
new_os().or_else(|e1| {
859-
warn!("OsRng failed: {}; falling back to JitterRng", e1);
860-
log_cause(&e1);
859+
warn!("OsRng failed [falling back to JitterRng]: {:?}", e1);
861860
new_jitter().map_err(|e2| {
862-
warn!("JitterRng failed: {}", e2);
863-
log_cause(&e2);
861+
warn!("JitterRng failed: {:?}", e2);
864862
// TODO: can we somehow return both error sources?
865863
Error::with_cause(
866864
ErrorKind::Unavailable,
@@ -1093,14 +1091,6 @@ pub fn sample<T, I, R>(rng: &mut R, iterable: I, amount: usize) -> Vec<T>
10931091
.unwrap_or_else(|e| e)
10941092
}
10951093

1096-
#[cfg(feature="std")]
1097-
fn log_cause(mut e: &::std::error::Error) {
1098-
while let Some(cause) = e.cause() {
1099-
warn!("cause: {}", cause);
1100-
e = cause;
1101-
}
1102-
}
1103-
11041094
#[cfg(test)]
11051095
mod test {
11061096
use impls;

src/os.rs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ use std::io::Read;
1717
#[allow(unused)] use std::path::Path;
1818
#[allow(unused)] use std::sync::{Once, Mutex, ONCE_INIT};
1919

20-
use {Rng, Error, ErrorKind, impls, log_cause};
20+
use {Rng, Error, ErrorKind, impls};
2121

2222
/// A random number generator that retrieves randomness straight from
2323
/// the operating system.
@@ -74,8 +74,7 @@ impl Rng for OsRng {
7474
loop {
7575
if let Err(e) = self.try_fill_bytes(dest) {
7676
if log_err == 0 {
77-
warn!("OsRng failed: {}", e);
78-
log_cause(&e);
77+
warn!("OsRng failed: {:?}", e);
7978
}
8079

8180
if e.kind().should_retry() {

0 commit comments

Comments
 (0)