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

Add configuration option for time zone to DateConverter #1324

Merged
merged 2 commits into from Jul 27, 2015

Conversation

Projects
None yet
2 participants
@joschi
Contributor

joschi commented Jul 24, 2015

Fixes #1320

@joschi joschi added this to the 1.2.0 milestone Jul 24, 2015

@joschi

This comment has been minimized.

Contributor

joschi commented Jul 24, 2015

Should this also be back-ported to 1.1.5?

@joschi joschi force-pushed the issue-1320 branch from 9e467c5 to ad59cf8 Jul 24, 2015

@edmundoa edmundoa self-assigned this Jul 27, 2015

this.timeZone = buildTimeZone(config.get("time_zone"));
}

private static DateTimeZone buildTimeZone(Object timeZoneId) {

This comment has been minimized.

@edmundoa

edmundoa Jul 27, 2015

Member

This method is exactly the same as the one in FlexibleDateConverter. Would it make sense to extract the method somewhere else? So far we have been using org.graylog2.plugin.Tools for that.

This comment has been minimized.

@joschi

joschi Jul 27, 2015

Contributor

You're right. I've opted to extract the common functionality into an abstract base class.

@edmundoa

This comment has been minimized.

Member

edmundoa commented Jul 27, 2015

LGTM :shipit:

edmundoa added a commit that referenced this pull request Jul 27, 2015

Merge pull request #1324 from Graylog2/issue-1320
Add configuration option for time zone to DateConverter

@edmundoa edmundoa merged commit 16dc8b0 into master Jul 27, 2015

1 of 2 checks passed

continuous-integration/travis-ci/push The Travis CI build is in progress
Details
ci Jenkins build graylog2-server-integration-pr 90 has succeeded
Details

@joschi joschi deleted the issue-1320 branch Jul 27, 2015

edmundoa added a commit that referenced this pull request Jul 27, 2015

Merge pull request #1324 from Graylog2/issue-1320
Add configuration option for time zone to DateConverter
(cherry picked from commit 16dc8b0)
@joschi

This comment has been minimized.

Contributor

joschi commented Jul 27, 2015

Back-ported into 1.1.x in 3066f9a.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment