Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Tee logs to stdout #75

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jan 27, 2022
Merged

Tee logs to stdout #75

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e8420ac
Tee logs to stdout
l4l Jan 27, 2022
a00d76e
Merge branch 'master' into dup-logs-to-stdout
l4l Jan 27, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 18 additions & 12 deletions src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,10 @@ macro_rules! prog_name {
};
}

fn setup_logger(level: LevelFilter, log_file: impl AsRef<Path>) {
fern::Dispatch::new()
fn setup_logger(level: LevelFilter, log_file: Option<impl AsRef<Path>>) {
use log::Log;

let dispatcher = fern::Dispatch::new()
.format(|out, message, record| {
out.finish(format_args!(
"{}[{}][{}] {}",
Expand All @@ -57,9 +59,18 @@ fn setup_logger(level: LevelFilter, log_file: impl AsRef<Path>) {
))
})
.level(level)
.chain(fern::log_file(log_file).unwrap())
.apply()
.unwrap();
.chain(std::io::stdout());

let dispatcher = if let Some(log_file) = log_file {
dispatcher.chain(fern::log_file(log_file).unwrap())
} else {
const VERSION: &str = env!("CARGO_PKG_VERSION");
let systemd_logger =
systemd_journal_logger::JournalLog::with_extra_fields(vec![("VERSION", VERSION)]);
dispatcher.chain(fern::Output::call(move |record| systemd_logger.log(record)))
};

dispatcher.apply().unwrap();
}

#[derive(StructOpt)]
Expand Down Expand Up @@ -115,13 +126,8 @@ fn main() {
(_, true) => LevelFilter::Warn,
_ => LevelFilter::Info,
};
if let Some(log_file) = args.log_file {
setup_logger(log_level, log_file);
} else {
const VERSION: &str = env!("CARGO_PKG_VERSION");
systemd_journal_logger::init_with_extra_fields(vec![("VERSION", VERSION)]).unwrap();
log::set_max_level(LevelFilter::Info);
}

setup_logger(log_level, args.log_file);

let (env, display, queue) =
sctk::new_default_environment!(Env, desktop, fields = [layer_shell: SimpleGlobal::new()])
Expand Down