Browse Source

Merge branch 'master' into master

pull/1236/head
Rainshaw 5 years ago
committed by GitHub
parent
commit
f7e69b7579
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 3
      src/error.rs

3
src/error.rs

@ -191,6 +191,7 @@ impl<'r> Responder<'r> for Error {
fn respond_to(self, _: &Request) -> response::Result<'r> {
match self.error {
ErrorKind::EmptyError(_) => {} // Don't print the error in this situation
ErrorKind::SimpleError(_) => {} // Don't print the error in this situation
_ => error!(target: "error", "{:#?}", self),
};
@ -210,9 +211,11 @@ impl<'r> Responder<'r> for Error {
#[macro_export]
macro_rules! err {
($msg:expr) => {{
error!("{}", $msg);
return Err(crate::error::Error::new($msg, $msg));
}};
($usr_msg:expr, $log_value:expr) => {{
error!("{}. {}", $usr_msg, $log_value);
return Err(crate::error::Error::new($usr_msg, $log_value));
}};
}

Loading…
Cancel
Save