arti: logging config: Replace a manual Debug impl

This commit is contained in:
Ian Jackson 2022-06-16 14:53:03 +01:00
parent 8b724d40f8
commit c5bbaf470a
3 changed files with 6 additions and 7 deletions

1
Cargo.lock generated
View File

@ -89,6 +89,7 @@ dependencies = [
"clap", "clap",
"config", "config",
"derive_builder_fork_arti", "derive_builder_fork_arti",
"educe",
"fs-mistrust", "fs-mistrust",
"futures", "futures",
"itertools", "itertools",

View File

@ -30,6 +30,7 @@ cfg-if = "1.0.0"
clap = "2.33.0" clap = "2.33.0"
config = { version = "0.13", default-features = false, features = ["toml"] } config = { version = "0.13", default-features = false, features = ["toml"] }
derive_builder = { version = "0.11", package = "derive_builder_fork_arti" } derive_builder = { version = "0.11", package = "derive_builder_fork_arti" }
educe = "0.4.6"
fs-mistrust = { path = "../fs-mistrust", version = "0.2.0" } fs-mistrust = { path = "../fs-mistrust", version = "0.2.0" }
futures = "0.3.14" futures = "0.3.14"
notify = "4.0" notify = "4.0"

View File

@ -2,6 +2,7 @@
use anyhow::{anyhow, Context, Result}; use anyhow::{anyhow, Context, Result};
use derive_builder::Builder; use derive_builder::Builder;
use educe::Educe;
use fs_mistrust::Mistrust; use fs_mistrust::Mistrust;
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use std::path::Path; use std::path::Path;
@ -96,7 +97,8 @@ pub struct LogfileConfig {
} }
/// How often to rotate a log file /// How often to rotate a log file
#[derive(Debug, Clone, Serialize, Deserialize, Copy, Eq, PartialEq)] #[derive(Debug, Clone, Educe, Serialize, Deserialize, Copy, Eq, PartialEq)]
#[educe(Default)]
#[non_exhaustive] #[non_exhaustive]
#[serde(rename_all = "lowercase")] #[serde(rename_all = "lowercase")]
pub enum LogRotation { pub enum LogRotation {
@ -105,15 +107,10 @@ pub enum LogRotation {
/// Rotate logs hourly /// Rotate logs hourly
Hourly, Hourly,
/// Never rotate the log /// Never rotate the log
#[educe(Default)]
Never, Never,
} }
impl Default for LogRotation {
fn default() -> Self {
Self::Never
}
}
impl LogfileConfig { impl LogfileConfig {
/// Return a new [`LogfileConfigBuilder`] /// Return a new [`LogfileConfigBuilder`]
pub fn builder() -> LogfileConfigBuilder { pub fn builder() -> LogfileConfigBuilder {