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

Make MemoryAppender thread-safe #2307

Merged
merged 2 commits into from Jun 3, 2016
Merged

Make MemoryAppender thread-safe #2307

merged 2 commits into from Jun 3, 2016

Conversation

@joschi
Copy link
Contributor

@joschi joschi commented May 30, 2016

Fixes #2302

Jochen Schalanda
Fixes #2302
@joschi joschi added this to the 2.0.3 milestone May 30, 2016
@joschi
Copy link
Contributor Author

@joschi joschi commented May 30, 2016

The PR has accidentally been opened based on the master branch. It should also be cherry-picked into the 2.0 branch.

…uch quicker and more reliably
@kroepke
Copy link
Member

@kroepke kroepke commented Jun 3, 2016

lgtm!

@kroepke kroepke self-assigned this Jun 3, 2016
@kroepke kroepke merged commit 9d411ef into master Jun 3, 2016
4 checks passed
4 checks passed
ci-server-integration Jenkins build graylog2-server-integration-pr 967 has succeeded
Details
ci-web-linter Jenkins build graylog-pr-linter-check 454 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
@kroepke kroepke deleted the issue-2302 branch Jun 3, 2016
kroepke added a commit that referenced this pull request Jun 3, 2016
* Make MemoryAppender thread-safe
* improve thread safety test to make the original implementation fail much quicker and more reliably

Fixes #2302
(cherry picked from commit 9d411ef)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

2 participants
You can’t perform that action at this time.