Skip to content

journald: use argv0 for syslog identifier #3372

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

journald: use argv0 for syslog identifier #3372

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 5 additions & 3 deletions tracing-journald/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,14 +100,16 @@ impl Layer {
pub fn new() -> io::Result<Self> {
#[cfg(unix)]
{
use std::path::Path;

let socket = UnixDatagram::unbound()?;
let layer = Self {
socket,
field_prefix: Some("F".into()),
syslog_identifier: std::env::current_exe()
.ok()
syslog_identifier: std::env::args_os()
.next()
.as_ref()
.and_then(|p| p.file_name())
.and_then(|p| Path::new(p).file_name())
.map(|n| n.to_string_lossy().into_owned())
// If we fail to get the name of the current executable fall back to an empty string.
.unwrap_or_default(),
Expand Down