jesus/dir-odt-to-pdf
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore: fix lines

Browse Source
This commit is contained in:
Jesús Pérex 2025-05-27 01:02:00 +01:00
parent 238b2a13e5
commit 5d5ae2d759
1 changed files with 12 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/logging.rs
View File

@ -1,11 +1,11 @@
use crate::error::{LogError, Result}; use log::{LevelFilter, Log, Record, Metadata};
use chrono::Local;
use log::{LevelFilter, Log, Metadata, Record};
use std::fs::OpenOptions; use std::fs::OpenOptions;
use std::io::{self, Write}; use std::io::{self, Write};
use std::path::PathBuf; use std::path::PathBuf;
use chrono::Local;
use std::sync::{Mutex, Arc};
use std::sync::OnceLock; use std::sync::OnceLock;
use std::sync::{Arc, Mutex}; use crate::error::{LogError, Result};
/// Configuration for logging setup /// Configuration for logging setup
#[derive(Debug, Clone, PartialEq)] #[derive(Debug, Clone, PartialEq)]
@ -85,8 +85,7 @@ impl SimpleLogger {
.lock() .lock()
.map_err(|e| LogError::LockPoisoned(e.to_string()).into()) .map_err(|e| LogError::LockPoisoned(e.to_string()).into())
.and_then(|mut writer| { .and_then(|mut writer| {
writer writer.write_all(message.as_bytes())
.write_all(message.as_bytes())
.and_then(|_| writer.flush()) .and_then(|_| writer.flush())
.map_err(|e| LogError::Io(e).into()) .map_err(|e| LogError::Io(e).into())
}) })
@ -95,9 +94,7 @@ impl SimpleLogger {
impl Log for SimpleLogger { impl Log for SimpleLogger {
fn enabled(&self, metadata: &Metadata) -> bool { fn enabled(&self, metadata: &Metadata) -> bool {
self.get_level() self.get_level().map(|level| metadata.level() <= level).unwrap_or(false)
.map(|level| metadata.level() <= level)
.unwrap_or(false)
} }
fn log(&self, record: &Record) { fn log(&self, record: &Record) {
@ -118,8 +115,7 @@ impl Log for SimpleLogger {
} }
fn flush(&self) { fn flush(&self) {
if let Err(e) = self if let Err(e) = self.writer
.writer
.lock() .lock()
.map_err(|e| LogError::LockPoisoned(e.to_string())) .map_err(|e| LogError::LockPoisoned(e.to_string()))
.and_then(|mut w| w.flush().map_err(LogError::Io)) .and_then(|mut w| w.flush().map_err(LogError::Io))
@ -163,8 +159,7 @@ pub fn init_logging(config: LogConfig) -> Result<()> {
&file, &file,
"=== Log started at {} ===", "=== Log started at {} ===",
Local::now().format("%Y-%m-%d %H:%M:%S") Local::now().format("%Y-%m-%d %H:%M:%S")
) ).map_err(LogError::Io)?;
.map_err(LogError::Io)?;
} }
Some(file) Some(file)
} else { } else {
@ -176,8 +171,7 @@ pub fn init_logging(config: LogConfig) -> Result<()> {
.clone(); .clone();
{ {
let mut lvl = level let mut lvl = level.lock()
.lock()
.map_err(|e| LogError::LockPoisoned(e.to_string()))?; .map_err(|e| LogError::LockPoisoned(e.to_string()))?;
*lvl = config.log_level; *lvl = config.log_level;
} }
@ -205,8 +199,7 @@ pub fn init_logging(config: LogConfig) -> Result<()> {
log::info!( log::info!(
"Logging initialized (level: {}, output: {})", "Logging initialized (level: {}, output: {})",
config.log_level, config.log_level,
config config.log_file
.log_file
.as_ref() .as_ref()
.map(|p| p.display().to_string()) .map(|p| p.display().to_string())
.unwrap_or_else(|| "console".to_string()) .unwrap_or_else(|| "console".to_string())
@ -214,3 +207,4 @@ pub fn init_logging(config: LogConfig) -> Result<()> {
Ok(()) Ok(())
} }