msfjarvis/clipboard-substitutor
1
Fork 0
mirror of https://github.com/msfjarvis/clipboard-substitutor synced 2025-08-14 23:37:01 +05:30
Code Issues Projects Releases Packages Wiki Activity Actions 2

fix(logging): correctly use feature attributes for journald

Browse source
This commit is contained in:
Harsh Shandilya 2022-03-10 16:43:15 +05:30
parent 4e2fa3f800
commit 0ba32ac499
No known key found for this signature in database
GPG key ID: 366D7BBAD1031E80
1 changed files with 14 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

23
src/main.rs
View file

@ -9,10 +9,7 @@ use std::path::PathBuf;
use anyhow::{anyhow, Result};
use clipboard::{ClipboardContext, ClipboardProvider};
use dirs::config_dir;
use tracing::{debug, error, Level};
#[cfg(journald)]
use tracing_journald::Subscriber;
use tracing_subscriber::FmtSubscriber;
use tracing::{debug, error};
use crate::config::{Act, Match, Replacements};
@ -49,8 +46,11 @@ fn print_version() {
);
}
#[cfg(not(journald))]
#[cfg(not(feature = "journald"))]
fn configure_tracing() {
use tracing_subscriber::FmtSubscriber;
use tracing::Level;
let subscriber = FmtSubscriber::builder()
.with_max_level(Level::TRACE)
.finish();
@ -59,11 +59,16 @@ fn configure_tracing() {
.expect("setting default subscriber failed");
}
#[cfg(journald)]
#[cfg(feature = "journald")]
fn configure_tracing() {
let sub = Registry::default()
.with(Subscriber::new().unwrap().with_field_prefix(None));
tracing::collect::with_default(sub, f);
use tracing_journald::Layer;
use tracing_subscriber::layer::SubscriberExt;
use tracing_subscriber::Registry;
let subscriber =
Registry::default().with(Layer::new().unwrap().with_field_prefix(None));
tracing::subscriber::set_global_default(subscriber)
.expect("setting default subscriber failed");
}
fn get_config_path() -> Result<PathBuf> {