finga/mqrs
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Refactor logging

Browse source 
To supporte more than a single log level `log` and `env_logger` crates
are used. For the application to support the different type of
argument, the verbose argument definition was adapted.
This commit is contained in:
finga 2021-07-07 17:13:08 +02:00
parent 6a41335603
commit 12b117db7e
8 changed files with 107 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/posix/send.rs
View file

@ -2,6 +2,7 @@ use anyhow::Result;
use chrono::DateTime;
use clap::Clap;
use humantime::Duration;
use log::info;
/// Send a message to a message queue
#[derive(Clap, Debug)]
@ -26,14 +27,8 @@ pub struct Send {
pub msg: String,
}
fn print_verbose(verbose: bool, msg: &str, queue: &str) {
if verbose {
println!("Sent message: \"{}\" to queue: {}", &msg, &queue);
}
}
impl Send {
pub fn run(&self, verbose: bool) -> Result<()> {
pub fn run(&self) -> Result<()> {
let mq = &mut posixmq::OpenOptions::writeonly();
if self.non_blocking {
@ -47,7 +42,7 @@ impl Send {
*timeout.parse::<Duration>()?,
)?;
print_verbose(verbose, &self.msg, &self.queue);
info!("Sent message: \"{}\" to queue: {}", &self.msg, &self.queue);
} else if let Some(deadline) = &self.deadline {
mq.open(&self.queue)?.send_deadline(
self.priority,
@ -55,12 +50,12 @@ impl Send {
DateTime::parse_from_str(deadline, "%Y-%m-%d %H:%M:%S")?.into(),
)?;
print_verbose(verbose, &self.msg, &self.queue);
info!("Sent message: \"{}\" to queue: {}", &self.msg, &self.queue);
} else {
mq.open(&self.queue)?
.send(self.priority, &self.msg.as_bytes())?;
print_verbose(verbose, &self.msg, &self.queue);
info!("Sent message: \"{}\" to queue: {}", &self.msg, &self.queue);
}
Ok(())