Skip to content

Commit

Permalink
Backport of fixes from more recent branches:
Browse files Browse the repository at this point in the history
Fixed incorrect millisecond to second conversion for retry_backoff_ms #216
Fixed unnecessary sleep after exhausted retries #166
Changed Kafka send errors to log as warn #179
  • Loading branch information
robbavey committed Feb 11, 2019
1 parent 6d3dd87 commit 6ac4b98
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 3 deletions.
6 changes: 4 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,10 @@ jdk: oraclejdk8
rvm:
- jruby-1.7.25
env:
- KAFKA_VERSION=0.10.0.1
before_install: ./kafka_test_setup.sh
- KAFKA_VERSION=0.10.2.2
before_install:
- gem install bundler -v '< 2'
- ./kafka_test_setup.sh
before_script:
- bundle exec rake vendor
script: bundle exec rspec && bundle exec rspec --tag integration
Expand Down
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
## 5.1.12
- Backport of fixes from more recent branches:
- Fixed incorrect millisecond to second conversion for retry_backoff_ms [#216](https://github.com/logstash-plugins/logstash-output-kafka/pull/216)
- Fixed unnecessary sleep after exhausted retries [#166](https://github.com/logstash-plugins/logstash-output-kafka/pull/166)
- Changed Kafka send errors to log as warn [#179](https://github.com/logstash-plugins/logstash-output-kafka/pull/179)

## 5.1.11
- Bugfix: Sends are now retried until successful. Previously, failed transmissions to Kafka
could have been lost by the KafkaProducer library. Now we verify transmission explicitly.
Expand Down
2 changes: 1 addition & 1 deletion kafka_test_setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ set -ex
if [ -n "${KAFKA_VERSION+1}" ]; then
echo "KAFKA_VERSION is $KAFKA_VERSION"
else
KAFKA_VERSION=0.10.1.0
KAFKA_VERSION=0.10.2.2
fi

echo "Downloading Kafka version $KAFKA_VERSION"
Expand Down

0 comments on commit 6ac4b98

Please sign in to comment.