Skip to content
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.

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

Support syslog messages with ISO-8601 timestamps #3228

Merged
merged 2 commits into from Dec 21, 2016
Merged

Support syslog messages with ISO-8601 timestamps #3228

merged 2 commits into from Dec 21, 2016

Conversation

@joschi
Copy link
Contributor

@joschi joschi commented Dec 21, 2016

Closes #2954

@joschi joschi added this to the 2.2.0 milestone Dec 21, 2016
https://tools.ietf.org/html/rfc5424#section-6

HEADER          = PRI VERSION SP TIMESTAMP SP HOSTNAME SP APP-NAME SP PROCID SP MSGID
PRI             = "<" PRIVAL ">"
PRIVAL          = 1*3DIGIT ; range 0 .. 191
VERSION         = NONZERO-DIGIT 0*2DIGIT
NONZERO-DIGIT   = %d49-57
DIGIT           = %d48 / NONZERO-DIGIT
@bernd bernd self-assigned this Dec 21, 2016
@@ -91,10 +89,7 @@ public Message decode(@Nonnull RawMessage rawMessage) {
remoteAddress = address.getInetSocketAddress();
}
return parse(msg, remoteAddress == null ? null: remoteAddress.getAddress(), rawMessage.getTimestamp());
} catch (ClassCastException e) {

This comment has been minimized.

@bernd

bernd Dec 21, 2016
Member

Why are you removing this?

This comment has been minimized.

@joschi

joschi Dec 21, 2016
Author Contributor

It didn't do anything. ClassCastException is a RuntimeException and the catch clause simply propagated (i. e. re-threw) the exception.

This comment has been minimized.

@bernd

bernd Dec 21, 2016
Member

Got it. 👍

@bernd
bernd approved these changes Dec 21, 2016
Copy link
Member

@bernd bernd left a comment

LGTM 👍

@bernd bernd merged commit a54b6f0 into master Dec 21, 2016
4 checks passed
4 checks passed
@garybot2
ci-web-linter Jenkins build graylog-pr-linter-check 1190 has succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
continuous-integration/travis-ci/push The Travis CI build passed
Details
licence/cla Contributor License Agreement is signed.
Details
@bernd bernd deleted the issue-2954 branch Dec 21, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

2 participants