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

Add missing error class #952

Closed
wants to merge 114 commits into from
Closed
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
114 commits
Select commit Hold shift + click to select a range
53459ad
Add `config_set_desc`
okkez Oct 16, 2015
59225ed
Add `desc` method
okkez Oct 16, 2015
76d5292
Add descriptions to in_dummy plugin parameters
okkez Oct 16, 2015
99e30ec
Doc: update README with Slack Team info
edsiper Oct 21, 2015
95e0151
Don't use popular name to prevent field overwrite when enable_ruby is…
repeatedly Oct 26, 2015
e90135a
in_monitor_agent emits plugins info to use exisiting plugins. fix #667
repeatedly Sep 4, 2015
64b613f
Log shutdown plugin info to check shutdown sequence
repeatedly Oct 27, 2015
fce745f
Tempfile should be binary mode
repeatedly Oct 28, 2015
988dbe8
Forgot to add v0.12 test in travis-ci
repeatedly Oct 29, 2015
aac0b72
Add Engine#msgpack_factory for v0.14 compatibility
repeatedly Oct 29, 2015
c3185fc
Use *args to forward all method arguments
repeatedly Oct 30, 2015
267cbb1
Merge pull request #693 from fluent/add-msgpack-factory-api
repeatedly Nov 2, 2015
d671123
Update test-unit gem to 3.1.4
repeatedly Nov 4, 2015
f03ee90
v0.12.17
repeatedly Nov 4, 2015
694af8b
Merge pull request #701 from cosmo0920/add-descriptions-out_file
repeatedly Nov 13, 2015
a9131db
Merge pull request #707 from fluent/forward-reject-empty
repeatedly Nov 24, 2015
6772784
Merge pull request #708 from fluent/support-process-name-configuration
repeatedly Nov 25, 2015
4e7e801
Merge pull request #702 from cosmo0920/add-parser-test-driver
repeatedly Nov 25, 2015
aa80092
Merge pull request #710 from tagomoris/safe-detach-process
repeatedly Nov 25, 2015
1080a53
Merge pull request #713 from okkez/add-descriptions-filter-record-tra…
sonots Nov 27, 2015
8214726
Merge pull request #714 from okkez/add-descriptions-filter-stdout
sonots Nov 27, 2015
f8b9f0c
Merge pull request #715 from okkez/add-description-to-log-level
sonots Nov 27, 2015
199cd75
Merge pull request #716 from okkez/add-descriptions-in-exec
sonots Nov 27, 2015
e5c19b4
Merge pull request #717 from okkez/add-descriptions-in-forward
sonots Nov 27, 2015
85013f9
Merge pull request #720 from okkez/add-descriptions-in-tcp
sonots Nov 27, 2015
fffddc0
Merge pull request #723 from okkez/add-descriptions-out-copy
sonots Nov 27, 2015
98cedf2
Merge pull request #722 from okkez/add-descriptions-buffer
sonots Nov 27, 2015
2bf6235
Merge pull request #721 from okkez/add-descriptions-base-input
sonots Nov 27, 2015
ed1701b
Merge pull request #724 from fluent/fix_delayed_forwarder
repeatedly Nov 28, 2015
552d101
Merge pull request #718 from okkez/add-descriptions-in-http
repeatedly Dec 3, 2015
c1dd17e
Merge pull request #727 from okkez/add-descriptions-in-unix
repeatedly Dec 3, 2015
4524970
Merge pull request #728 from okkez/add-descriptions-out-exec-filter
repeatedly Dec 3, 2015
6f4fe9c
Merge pull request #729 from okkez/add-descriptions-out-forward
repeatedly Dec 3, 2015
cdaddc4
Merge pull request #730 from okkez/add-descriptions-out-stdout
repeatedly Dec 3, 2015
5391dd1
Merge pull request #732 from okkez/add-descriptions-in-syslog
repeatedly Dec 3, 2015
a6904e3
Merge pull request #712 from cosmo0920/add-formatter-test-driver
repeatedly Dec 3, 2015
2b20c3f
Merge pull request #706 from okkez/show-plugin-config-ancestors
repeatedly Dec 3, 2015
9456270
Merge pull request #719 from okkez/add-descriptions-in-tail
repeatedly Dec 4, 2015
aace26c
Merge pull request #704 from fluent/support-text-parser-in-exec
repeatedly Dec 4, 2015
0d3f856
Merge pull request #733 from cosmo0920/desc-out-exec
repeatedly Dec 4, 2015
24ce769
Merge pull request #734 from icyfork/in_tail-exclude_all_unreadable_f…
repeatedly Dec 7, 2015
d288762
test should not use v0.14 assert
repeatedly Dec 8, 2015
f2b92e7
Update travis to follow master branch
repeatedly Dec 8, 2015
4f6ecff
Merge pull request #526 from sabottenda/fix-in_exec-shutdown
repeatedly Dec 8, 2015
1e46058
v0.12.18
repeatedly Dec 9, 2015
4ca4cad
Merge pull request #743 from skippy/standardize-input-logging
repeatedly Dec 10, 2015
b96be61
Merge pull request #747 from fluent/fix-fluent-cat
repeatedly Dec 16, 2015
cd01f11
Add fluent/time.rb placeholder for v0.14
repeatedly Dec 21, 2015
d179ee9
Merge pull request #748 from fluent/support-oj-in-json-parser
repeatedly Dec 18, 2015
316d3de
Merge pull request #745 from fluent/add-block-action-to-buffer
repeatedly Dec 20, 2015
3e26b97
0.12 doesn't have EventTime
repeatedly Dec 21, 2015
920645a
v0.12.19
repeatedly Dec 21, 2015
232c38a
Merge pull request #766 from sonots/fast_record_transformer
sonots Jan 8, 2016
8a246d3
Merge pull request #757 from riywo/patch-1
repeatedly Dec 27, 2015
7f6b47a
Merge pull request #761 from okkez/suppress-warning
sonots Dec 29, 2015
d063ac8
Merge pull request #759 from okkez/add-descriptions-output
sonots Dec 29, 2015
b835c07
Merge pull request #760 from okkez/add-descriptions-for-time-sliced-o…
sonots Dec 29, 2015
2e94560
Merge pull request #765 from fluent/fix-regression-of-unused-paramete…
repeatedly Jan 6, 2016
03865d4
Merge pull request #763 from cosmo0920/travis-ruby-2.3.0
repeatedly Jan 6, 2016
c3b7d86
Merge pull request #762 from fluent/input_output_test_driver_num_waits
repeatedly Jan 6, 2016
3611106
Merge pull request #778 from fluent/fix-773
repeatedly Jan 17, 2016
2346830
Merge pull request #775 from kikumoto/multiline_periodic_flush
repeatedly Jan 17, 2016
413738b
Merge pull request #781 from ysksn/add_some_objects
repeatedly Jan 21, 2016
b4bc709
Merge pull request #776 from fluent/add-skip-invalid-event
repeatedly Jan 23, 2016
d20398c
v0.12 doesn't have EventTime
repeatedly Jan 25, 2016
e89da82
v0.12.20
repeatedly Jan 25, 2016
0da3442
Merge pull request #791 from fluent/use-error-stream-in-tsoutput-emit
repeatedly Feb 4, 2016
aee8086
Merge pull request #797 from fluent/skip-broken-event-in-tsoutput
repeatedly Feb 9, 2016
d1ba7d8
Merge pull request #794 from fluent/separate-system-config
tagomoris Feb 9, 2016
eb1478d
Merge pull request #795 from fluent/hash-syntax
tagomoris Feb 9, 2016
14bfef2
Merge pull request #805 from cosmo0920/v0.12-separate-system-config
repeatedly Feb 16, 2016
9beac48
Merge pull request #806 from cosmo0920/v0.12-hash-syntax
repeatedly Feb 16, 2016
6802dc2
Fix to do `require` for required files straightforward, per files
tagomoris Feb 9, 2016
8484c77
Merge pull request #808 from okkez/fix-dependencies-between-files-v0.12
repeatedly Mar 2, 2016
212f4f8
Merge pull request #788 from dwoo4dwoo/reduce_tail_opens
repeatedly Feb 12, 2016
51786e6
Merge pull request #802 from fluent/fix-in_monitor_agent-debug
repeatedly Feb 14, 2016
be46bbf
Merge pull request #809 from okkez/dont-require-rubygems
tagomoris Feb 19, 2016
dd0a2f3
Merge pull request #811 from dwoo4dwoo/disable_watch_timer
repeatedly Feb 27, 2016
a1e2005
Merge pull request #816 from fluent/fix_record_transformer_race
repeatedly Mar 1, 2016
1471632
Merge pull request #817 from fluent/relax_auto_typecast
repeatedly Mar 2, 2016
27cf781
FileWrapper is introduced since v0.14. Don't use in v0.12
repeatedly Mar 2, 2016
41d1724
Merge pull request #810 from fluent/fix-in_tail-for-bqle
repeatedly Mar 2, 2016
c90a1b2
Merge pull request #821 from fluent/enum-list-must-be-of-symbols
repeatedly Mar 2, 2016
a9dfedd
Merge pull request #822 from fluent/fix-set-system-config-in-sighup
repeatedly Mar 2, 2016
556cc58
Add missing require
okkez Mar 3, 2016
c1e736c
Add missing require
cosmo0920 Mar 3, 2016
46f825f
Add missing require
cosmo0920 Mar 3, 2016
3759231
Merge pull request #823 from okkez/add-missing-require
repeatedly Mar 3, 2016
ff0738f
Add missing require
cosmo0920 Mar 3, 2016
3b3c267
Merge pull request #826 from cosmo0920/add-missing-require-for-filter
repeatedly Mar 3, 2016
2eab62b
Merge pull request #824 from cosmo0920/add-missing-require-for-versio…
repeatedly Mar 3, 2016
d0cdded
Merge pull request #825 from cosmo0920/add-missing-require-for-mixin
repeatedly Mar 3, 2016
b585e9f
Add missing require
okkez Mar 4, 2016
c028103
Merge pull request #828 from okkez/add-missing-require-for-input-plug…
repeatedly Mar 4, 2016
dae7268
v0.12.21
repeatedly Mar 4, 2016
386ff3e
Merge pull request #845 from fluent/fix-missing-fcntl
repeatedly Mar 11, 2016
282af78
v0.12.22
repeatedly Mar 11, 2016
a227d97
Merge pull request #891 from cosmo0920/fix-broken-fluent-debug-command
tagomoris Apr 11, 2016
73b5471
Merge pull request #894 from cosmo0920/fix-broken-fluent-debug-comman…
repeatedly Apr 11, 2016
099ae2d
Add test for log related class and module
okkez Apr 28, 2016
25a51a1
Fix logger on Fluent::StringUtil to use $log.
toyama0919 Apr 20, 2016
49bdb09
fix assigning an object with unconsistent API
tagomoris Apr 22, 2016
a34f668
Fix string-scrub dependency on ruby > 2
errm May 4, 2016
c6a46d4
Merge pull request #933 from errm/v0.12
repeatedly May 4, 2016
dcdbda2
v0.12.23
repeatedly May 4, 2016
2050bd7
Add support for drop_oldest_chunk when buffer queue is full
varunkumta May 4, 2016
edc4354
Fix string-scrub dependency
okkez May 9, 2016
6e8e0ed
Add missing require when we use Ruby 2.0 or 1.9.3
okkez May 9, 2016
2443758
Merge pull request #937 from okkez/fix-string-scrub-dependency
repeatedly May 9, 2016
7031bfa
Merge pull request #934 from varunkumta/v0.12
repeatedly May 11, 2016
4d82f0d
Merge pull request #927 from okkez/backport-913
repeatedly May 16, 2016
a710558
Merge pull request #925 from okkez/backport-909
repeatedly May 16, 2016
21ea8a5
Merge pull request #926 from okkez/backport-907
repeatedly May 16, 2016
4e0032f
add error class definition which is used but not defined yet
tagomoris Apr 27, 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 logger on Fluent::StringUtil to use $log.
  • Loading branch information
toyama0919 authored and okkez committed Apr 28, 2016
commit 25a51a17efac932fa72778728ca891388c09ed19
2 changes: 1 addition & 1 deletion lib/fluent/plugin/string_util.rb
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ def match_regexp(regexp, string)
return regexp.match(string)
rescue ArgumentError => e
raise e unless e.message.index("invalid byte sequence in".freeze).zero?
log.info "invalid byte sequence is replaced in `#{string}`"
$log.info "invalid byte sequence is replaced in `#{string}`"
string = string.scrub('?')
retry
end
Expand Down
26 changes: 26 additions & 0 deletions test/plugin/test_string_util.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
require_relative '../helper'
require 'fluent/plugin/string_util'

class StringUtilTest < Test::Unit::TestCase
def setup
@null_value_pattern = Regexp.new("^(-|null|NULL)$")
end

sub_test_case 'valid string' do
test 'null string' do
assert_equal Fluent::StringUtil.match_regexp(@null_value_pattern, "null").to_s, "null"
assert_equal Fluent::StringUtil.match_regexp(@null_value_pattern, "NULL").to_s, "NULL"
assert_equal Fluent::StringUtil.match_regexp(@null_value_pattern, "-").to_s, "-"
end

test 'normal string' do
assert_equal Fluent::StringUtil.match_regexp(@null_value_pattern, "fluentd"), nil
end
end

sub_test_case 'invalid string' do
test 'normal string' do
assert_equal Fluent::StringUtil.match_regexp(@null_value_pattern, "\xff"), nil
end
end
end