rodolphe/rust-opensmtpd
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Improve the simple_filter macro

Browse source 
The simple_filter macro must accept the two different levels of
contexts. In the same way, it should also accept the log level, and
therefore replace the now removed simple_filter_log_level macro.
This commit is contained in:
Rodolphe Breard 2019-09-18 14:52:21 +02:00
parent 789a41b51e
commit 995c0c35c1
4 changed files with 46 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

46
opensmtpd/src/lib.rs
View file

@ -26,22 +26,35 @@ pub use opensmtpd_derive::report;
#[macro_export]
macro_rules! simple_filter {
($( $x:expr ),*) => {
opensmtpd::simple_filter_log_level!(log::Level::Info $(,$x)*);
($handlers: expr) => {
opensmtpd::simple_filter!(
log::Level::Info,
opensmtpd::NoContext,
opensmtpd::NoContext,
$handlers
);
};
}
#[macro_export]
macro_rules! simple_filter_log_level {
($log_level: expr, $( $x:expr ),*) => {
let mut handlers = Vec::new();
$(
handlers.push(($x)());
)*;
let _ = opensmtpd::SmtpdLogger::new()
.set_level($log_level)
.init();
opensmtpd::Filter::<opensmtpd::input::StdIn, opensmtpd::output::StdOut>::default().set_handlers(&handlers).register_events().run();
($filter_ctx: ty, $handlers: expr) => {
opensmtpd::simple_filter!(
log::Level::Info,
opensmtpd::NoContext,
$filter_ctx,
$handlers
);
};
($sesion_ctx: ty, $filter_ctx: ty, $handlers: expr) => {
opensmtpd::simple_filter!(log::Level::Info, $sesion_ctx, $filter_ctx, $handlers);
};
($log_level: path, $sesion_ctx: ty, $filter_ctx: ty, $handlers: expr) => {
let handlers = ($handlers)
.iter()
.map(|f| f())
.collect::<Vec<opensmtpd::Handler>>();
let _ = opensmtpd::SmtpdLogger::new().set_level($log_level).init();
opensmtpd::Filter::<opensmtpd::input::StdIn, opensmtpd::output::StdOut>::default()
.set_handlers(handlers.as_slice())
.register_events()
.run();
};
}
@ -71,6 +84,9 @@ macro_rules! register_events {
};
}
#[derive(Default)]
pub struct NoContext;
pub struct Filter<I, O>
where
I: crate::input::FilterInput + Default,