Skip to content

Commit

Permalink
Update syslog_loose to properly handle escapes (#353)
Browse files Browse the repository at this point in the history
Signed-off-by: Stephen Wakely <[email protected]>
  • Loading branch information
StephenWakely authored Jul 31, 2023
1 parent 47ca0c5 commit d51887f
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 5 deletions.
4 changes: 2 additions & 2 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ sha-1 = { version = "0.10", optional = true }
sha-2 = { package = "sha2", version = "0.10", optional = true }
sha-3 = { package = "sha3", version = "0.10", optional = true }
strip-ansi-escapes = { version = "0.1", optional = true }
syslog_loose = { version = "0.18", optional = true }
syslog_loose = { version = "0.19", optional = true }
termcolor = {version = "1", optional = true }
thiserror ={ version = "1", optional = true }
tracing = { version = "0.1.34", default-features = false, optional = true }
Expand Down
9 changes: 7 additions & 2 deletions src/stdlib/parse_syslog.rs
Original file line number Diff line number Diff line change
@@ -1,15 +1,20 @@
use crate::compiler::prelude::*;
use chrono::{DateTime, Datelike, Utc};
use std::collections::BTreeMap;
use syslog_loose::{IncompleteDate, Message, ProcId, Protocol};
use syslog_loose::{IncompleteDate, Message, ProcId, Protocol, Variant};

pub(crate) fn parse_syslog(value: Value, ctx: &Context) -> Resolved {
let message = value.try_bytes_utf8_lossy()?;
let timezone = match ctx.timezone() {
TimeZone::Local => None,
TimeZone::Named(tz) => Some(*tz),
};
let parsed = syslog_loose::parse_message_with_year_exact_tz(&message, resolve_year, timezone)?;
let parsed = syslog_loose::parse_message_with_year_exact_tz(
&message,
resolve_year,
timezone,
Variant::Either,
)?;
Ok(message_to_value(parsed))
}

Expand Down

0 comments on commit d51887f

Please sign in to comment.