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.

Sign up for GitHub

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

Compatibility layers for v0.12 plugins #912

Merged
merged 22 commits into from
May 17, 2016
Merged

Compatibility layers for v0.12 plugins #912

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
0c50578
fix test with added (missing) error definition
tagomoris Apr 27, 2016
51a1a24
Add Base#inspect to show this object in simple/short way
tagomoris Apr 21, 2016
e5769f7
add fluent/compat/filter and make Fluent::Filter with it
tagomoris Apr 21, 2016
a1d6754
add fluent/compat/input and make Fluent::Input with it
tagomoris Apr 21, 2016
bf3dbcc
add comments about time handling
tagomoris Apr 25, 2016
d5e90de
fix to extend chunk to add method for event iteration
tagomoris Apr 25, 2016
9714328
remove fileutils
tagomoris Apr 27, 2016
d096726
add optimization
tagomoris Apr 27, 2016
8c07b0c
take care about NaN & Inf
tagomoris Apr 27, 2016
0688ba0
add buffer path pattern only for suffix
tagomoris Apr 27, 2016
a5a6b98
initialize minimal internal things as early as possible for tests
tagomoris Apr 27, 2016
5e93092
Add compatibility layers for output plugin
tagomoris Apr 27, 2016
33264de
fix tests for core modules/classes with newer API
tagomoris Apr 27, 2016
a52e4d1
fix to use test driver for buffered output
tagomoris Apr 27, 2016
b70b508
re-implement symlink_path feature on v0.14 buffer APIs
tagomoris Apr 27, 2016
fc2c76d
add break condition to wait checks to run
tagomoris Apr 28, 2016
903f4c2
update comments for correctness
tagomoris May 9, 2016
403cf5f
add deprecation warning for "type" in secondary section
tagomoris May 9, 2016
e0afba5
fix to use more explicit name
tagomoris May 9, 2016
dc9fe04
fix tests for exponential_backoff
tagomoris May 9, 2016
0785ec5
for readability
tagomoris May 9, 2016
a424505
remove/merge dup code
tagomoris May 9, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix to use more explicit name
  • Loading branch information
@tagomoris
tagomoris committed May 13, 2016
commit e0afba5333ef9fcdc16a5fca1f746c43f8b9868b
6 changes: 3 additions & 3 deletions lib/fluent/compat/output.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,7 @@ def configure(conf)
if config_style == :v0
buf_params = {
"flush_mode" => "fast",
"retry_type" => "expbackoff",
"retry_type" => "exponential_backoff",
}
PARAMS_MAP.each do |older, newer|
buf_params[newer] = conf[older] if conf.has_key?(older)
Expand Down Expand Up @@ -337,7 +337,7 @@ def configure(conf)
if config_style == :v0
buf_params = {
"flush_mode" => "fast",
"retry_type" => "expbackoff",
"retry_type" => "exponential_backoff",
}
PARAMS_MAP.each do |older, newer|
buf_params[newer] = conf[older] if conf.has_key?(older)
Expand Down Expand Up @@ -465,7 +465,7 @@ def configure(conf)
buf_params = {
"@type" => "file2",
"flush_mode" => (conf['flush_interval'] ? "fast" : "none"),
"retry_type" => "expbackoff",
"retry_type" => "exponential_backoff",
}
PARAMS_MAP.each do |older, newer|
buf_params[newer] = conf[older] if conf.has_key?(older)
Expand Down
2 changes: 1 addition & 1 deletion lib/fluent/plugin/output.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ class Output < Base
# expornential backoff sequence will be initialized at the time of this threshold

desc 'How to wait next retry to flush buffer.'
config_param :retry_type, :enum, list: [:expbackoff, :periodic], default: :expbackoff
config_param :retry_type, :enum, list: [:exponential_backoff, :periodic], default: :exponential_backoff
### Periodic -> fixed :retry_wait
### Exponencial backoff: k is number of retry times
# c: constant factor, @retry_wait
Expand Down
2 changes: 1 addition & 1 deletion lib/fluent/plugin_helper/retry_state.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ def retry_state_create(
secondary: false, secondary_threshold: 0.8
)
case retry_type
when :expbackoff
when :exponential_backoff
ExponentialBackOffRetry.new(title, wait, timeout, forever, max_steps, randomize, randomize_width, backoff_base, max_interval, secondary, secondary_threshold)
when :periodic
PeriodicRetry.new(title, wait, timeout, forever, max_steps, randomize, randomize_width, secondary, secondary_threshold)
Expand Down