Skip to content

Commit b009e4d

Browse files
chore(codecs): Update syslog_loose to properly handle escapes (vectordotdev#18114)
* Update syslog_loose to properly handle escapes Signed-off-by: Stephen Wakely <[email protected]> * fmt Signed-off-by: Stephen Wakely <[email protected]> --------- Signed-off-by: Stephen Wakely <[email protected]>
1 parent a06c711 commit b009e4d

File tree

3 files changed

+16
-5
lines changed

3 files changed

+16
-5
lines changed

Cargo.lock

+12-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lib/codecs/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ serde = { version = "1", default-features = false, features = ["derive"] }
2323
serde_json = { version = "1", default-features = false }
2424
smallvec = { version = "1", default-features = false, features = ["union"] }
2525
snafu = { version = "0.7.5", default-features = false, features = ["futures"] }
26-
syslog_loose = { version = "0.18", default-features = false, optional = true }
26+
syslog_loose = { version = "0.19", default-features = false, optional = true }
2727
tokio-util = { version = "0.7", default-features = false, features = ["codec"] }
2828
tracing = { version = "0.1", default-features = false }
2929
vrl.workspace = true

lib/codecs/src/decoding/format/syslog.rs

+3-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ use lookup::{event_path, owned_value_path, OwnedTargetPath, OwnedValuePath};
55
use smallvec::{smallvec, SmallVec};
66
use std::borrow::Cow;
77
use std::collections::BTreeMap;
8-
use syslog_loose::{IncompleteDate, Message, ProcId, Protocol};
8+
use syslog_loose::{IncompleteDate, Message, ProcId, Protocol, Variant};
99
use vector_config::configurable_component;
1010
use vector_core::config::{LegacyKey, LogNamespace};
1111
use vector_core::{
@@ -282,7 +282,8 @@ impl Deserializer for SyslogDeserializer {
282282
false => Cow::from(std::str::from_utf8(&bytes)?),
283283
};
284284
let line = line.trim();
285-
let parsed = syslog_loose::parse_message_with_year_exact(line, resolve_year)?;
285+
let parsed =
286+
syslog_loose::parse_message_with_year_exact(line, resolve_year, Variant::Either)?;
286287

287288
let log = match (self.source, log_namespace) {
288289
(Some(source), LogNamespace::Vector) => {

0 commit comments

Comments
 (0)