fluentd 0.10.3 → 0.10.4
Sign up to get free protection for your applications and to get access to all the features.
Potentially problematic release.
This version of fluentd might be problematic. Click here for more details.
- data/.gitignore +20 -0
- data/.rvmrc +1 -0
- data/ChangeLog +7 -0
- data/Gemfile +3 -0
- data/Makefile.am +50 -0
- data/Rakefile +3 -42
- data/VERSION +1 -1
- data/autogen.sh +67 -0
- data/configure.in +52 -0
- data/fluentd.gemspec +35 -114
- data/lib/fluent/engine.rb +10 -6
- data/lib/fluent/plugin/buf_file.rb +3 -13
- data/lib/fluent/test/base.rb +2 -1
- data/lib/fluent/version.rb +1 -1
- data/test/plugin/in_stream.rb +16 -0
- metadata +72 -115
data/.gitignore
ADDED
@@ -0,0 +1,20 @@
|
|
1
|
+
Gemfile.lock
|
2
|
+
INSTALL
|
3
|
+
NEWS
|
4
|
+
Makefile
|
5
|
+
Makefile.in
|
6
|
+
README
|
7
|
+
ac
|
8
|
+
aclocal.m4
|
9
|
+
autom4te.cache
|
10
|
+
confdefs.h
|
11
|
+
config.log
|
12
|
+
config.status
|
13
|
+
configure
|
14
|
+
deps/
|
15
|
+
fluent-cat
|
16
|
+
fluent-gem
|
17
|
+
fluentd
|
18
|
+
pkg/*
|
19
|
+
test/tmp/*
|
20
|
+
make_dist.sh
|
data/.rvmrc
ADDED
@@ -0,0 +1 @@
|
|
1
|
+
rvm 1.9.2
|
data/ChangeLog
CHANGED
@@ -1,4 +1,11 @@
|
|
1
1
|
|
2
|
+
Release 0.10.4 - 2011/11/07
|
3
|
+
|
4
|
+
* TestDriver uses klass.dup.module_eval instead of inheriting class to
|
5
|
+
override methods
|
6
|
+
* fixed encoding problem of String#[] in FileBufferChunk#<<(data)
|
7
|
+
|
8
|
+
|
2
9
|
Release 0.10.3 - 2011/10/21
|
3
10
|
|
4
11
|
* Supports 'include' in config file
|
data/Gemfile
ADDED
data/Makefile.am
ADDED
@@ -0,0 +1,50 @@
|
|
1
|
+
|
2
|
+
SUBDIRS = deps/ruby
|
3
|
+
|
4
|
+
bin_SCRIPTS = fluent-gem fluent-cat fluentd
|
5
|
+
|
6
|
+
MOSTLYCLEANFILES = $(bin_SCRIPTS)
|
7
|
+
|
8
|
+
DEST_RUBY = $(DESTDIR)$(RUBY_BINDIR)/ruby
|
9
|
+
DEST_GEM = $(DEST_RUBY) -rrubygems -rrubygems/gem_runner -rrubygems/exceptions -rrubygems/installer -e 'class Gem::Installer; def shebang(bin_file_name) "\#\!$(RUBY_BINDIR)/ruby" end; end; Gem::GemRunner.new.run ARGV'
|
10
|
+
DEST_RAKE = $(DEST_RUBY) -rrake -e 'Rake.application.run'
|
11
|
+
DEST_RUBY_LIBDIR = $(DESTDIR)$(RUBY_LIBDIR)/ruby
|
12
|
+
|
13
|
+
fluent-gem:
|
14
|
+
echo '#!/bin/sh' > $@
|
15
|
+
echo 'exec "$(RUBY_BINDIR)/gem" "$$@"' >> $@
|
16
|
+
chmod 755 $@
|
17
|
+
|
18
|
+
fluent-cat:
|
19
|
+
echo '#!/bin/sh' > $@
|
20
|
+
echo 'export FLUENT_CONF="$(sysconfdir)/fluent/fluent.conf"' >> $@
|
21
|
+
echo 'export FLUENT_PLUGIN="$(sysconfdir)/fluent/plugin"' >> $@
|
22
|
+
echo 'export FLUENT_SOCKET="$(localstatedir)/run/fluent.sock"' >> $@
|
23
|
+
echo 'exec "$(RUBY_BINDIR)/fluent-cat" "$$@"' >> $@
|
24
|
+
chmod 755 $@
|
25
|
+
|
26
|
+
fluentd:
|
27
|
+
echo '#!/bin/sh' > $@
|
28
|
+
echo 'export FLUENT_CONF="$(sysconfdir)/fluent/fluent.conf"' >> $@
|
29
|
+
echo 'export FLUENT_PLUGIN="$(sysconfdir)/fluent/plugin"' >> $@
|
30
|
+
echo 'export FLUENT_SOCKET="$(localstatedir)/run/fluent.sock"' >> $@
|
31
|
+
echo 'exec "$(RUBY_BINDIR)/fluentd" "$$@"' >> $@
|
32
|
+
chmod 755 $@
|
33
|
+
|
34
|
+
install: install-recursive
|
35
|
+
for gem in $(srcdir)/deps/*.gem; do \
|
36
|
+
RUBYLIB="$(DEST_RUBY_LIBDIR)/1.9.1:$(DEST_RUBY_LIBDIR)/1.9.1/$(shell $(DEST_RUBY) --version | sed -E 's/.*\[(.*)\]/\1/')" \
|
37
|
+
$(DEST_GEM) install --no-rdoc --no-ri "$$gem"; \
|
38
|
+
done
|
39
|
+
cd "$(srcdir)" && \
|
40
|
+
RUBYLIB="$(DEST_RUBY_LIBDIR)/1.9.1:$(DEST_RUBY_LIBDIR)/1.9.1/$(shell $(DEST_RUBY) --version | sed -E 's/.*\[(.*)\]/\1/')" \
|
41
|
+
$(DEST_RAKE)
|
42
|
+
RUBYLIB="$(DEST_RUBY_LIBDIR)/1.9.1:$(DEST_RUBY_LIBDIR)/1.9.1/$(shell $(DEST_RUBY) --version | sed -E 's/.*\[(.*)\]/\1/')" \
|
43
|
+
$(DEST_GEM) install --no-rdoc --no-ri "$(srcdir)/pkg/fluentd-$(VERSION).gem"
|
44
|
+
mkdir -p $(DESTDIR)$(sysconfdir)/fluent
|
45
|
+
cp -f $(srcdir)/fluent.conf $(DESTDIR)$(sysconfdir)/fluent/fluent.conf
|
46
|
+
mkdir -p $(DESTDIR)$(sysconfdir)/fluent/plugin
|
47
|
+
|
48
|
+
dist:
|
49
|
+
cd $(srcdir) && ./make_dist.sh
|
50
|
+
|
data/Rakefile
CHANGED
@@ -2,32 +2,8 @@ require 'rake'
|
|
2
2
|
require 'rake/testtask'
|
3
3
|
require 'rake/clean'
|
4
4
|
|
5
|
-
|
6
|
-
|
7
|
-
Jeweler::Tasks.new do |gemspec|
|
8
|
-
gemspec.name = "fluentd"
|
9
|
-
gemspec.summary = "Fluent event collector"
|
10
|
-
gemspec.author = "Sadayuki Furuhashi"
|
11
|
-
gemspec.email = "frsyuki@gmail.com"
|
12
|
-
gemspec.homepage = "http://fluentd.org/"
|
13
|
-
gemspec.has_rdoc = false
|
14
|
-
gemspec.require_paths = ["lib"]
|
15
|
-
gemspec.add_dependency "msgpack", "~> 0.4.4"
|
16
|
-
gemspec.add_dependency "json", ">= 1.4.3"
|
17
|
-
gemspec.add_dependency "yajl-ruby", "~> 1.0.0"
|
18
|
-
gemspec.add_dependency "cool.io", "~> 1.0.0"
|
19
|
-
gemspec.add_dependency "http_parser.rb", "~> 0.5.1"
|
20
|
-
gemspec.add_dependency "rake", ">= 0.9.2"
|
21
|
-
gemspec.test_files = Dir["test/**/*.rb"]
|
22
|
-
gemspec.files = Dir["bin/**/*", "lib/**/*", "test/**/*.rb"] +
|
23
|
-
%w[fluent.conf VERSION AUTHORS Rakefile COPYING fluentd.gemspec]
|
24
|
-
gemspec.executables = ['fluentd', 'fluent-cat', 'fluent-gem']
|
25
|
-
gemspec.required_ruby_version = '~> 1.9.2'
|
26
|
-
end
|
27
|
-
Jeweler::GemcutterTasks.new
|
28
|
-
rescue LoadError
|
29
|
-
puts "Jeweler not available. Install it with: gem install jeweler"
|
30
|
-
end
|
5
|
+
require 'bundler'
|
6
|
+
Bundler::GemHelper.install_tasks
|
31
7
|
|
32
8
|
Rake::TestTask.new(:test) do |t|
|
33
9
|
t.test_files = Dir['test/*_test.rb']
|
@@ -35,21 +11,6 @@ Rake::TestTask.new(:test) do |t|
|
|
35
11
|
t.ruby_opts << '-I.'
|
36
12
|
end
|
37
13
|
|
38
|
-
VERSION_FILE = "lib/fluent/version.rb"
|
39
|
-
|
40
|
-
file VERSION_FILE => ["VERSION"] do |t|
|
41
|
-
version = File.read("VERSION").strip
|
42
|
-
File.open(VERSION_FILE, "w") {|f|
|
43
|
-
f.write <<EOF
|
44
|
-
module Fluent
|
45
|
-
|
46
|
-
VERSION = '#{version}'
|
47
|
-
|
48
|
-
end
|
49
|
-
EOF
|
50
|
-
}
|
51
|
-
end
|
52
|
-
|
53
14
|
task :test => [:base_test]
|
54
15
|
|
55
16
|
Rake::TestTask.new(:base_test) do |t|
|
@@ -59,5 +20,5 @@ Rake::TestTask.new(:base_test) do |t|
|
|
59
20
|
#t.warning = true
|
60
21
|
end
|
61
22
|
|
62
|
-
task :default => [
|
23
|
+
task :default => [:build]
|
63
24
|
|
data/VERSION
CHANGED
@@ -1 +1 @@
|
|
1
|
-
0.10.
|
1
|
+
0.10.4
|
data/autogen.sh
ADDED
@@ -0,0 +1,67 @@
|
|
1
|
+
#!/bin/bash
|
2
|
+
|
3
|
+
mkdir -p ac
|
4
|
+
test -f AUTHORS || touch AUTHORS
|
5
|
+
test -f COPYING || touch COPYING
|
6
|
+
test -f ChangeLog || touch ChangeLog
|
7
|
+
test -f NEWS || touch NEWS
|
8
|
+
test -f NOTICE || touch NOTICE
|
9
|
+
test -f README || cp -f README.rdoc README
|
10
|
+
|
11
|
+
function download() {
|
12
|
+
if [ ! -f "$2" ];then
|
13
|
+
wget "$1/$2" -O "$2" || exit 1
|
14
|
+
fi
|
15
|
+
}
|
16
|
+
|
17
|
+
mkdir -p deps
|
18
|
+
mkdir -p deps/ruby
|
19
|
+
mkdir -p plugins
|
20
|
+
cd deps
|
21
|
+
download "http://ftp.ruby-lang.org/pub/ruby/1.9" "ruby-1.9.2-p180.tar.bz2"
|
22
|
+
download "http://rubygems.org/downloads" "jeweler-1.6.2.gem"
|
23
|
+
download "http://rubygems.org/downloads" "json-1.5.2.gem"
|
24
|
+
download "http://rubygems.org/downloads" "msgpack-0.4.4.gem"
|
25
|
+
download "http://rubygems.org/downloads" "iobuffer-0.1.3.gem"
|
26
|
+
download "http://rubygems.org/downloads" "cool.io-1.0.0.gem"
|
27
|
+
download "http://rubygems.org/downloads" "http_parser.rb-0.5.1.gem"
|
28
|
+
download "http://rubygems.org/downloads" "yajl-ruby-1.0.0.gem"
|
29
|
+
cd ..
|
30
|
+
|
31
|
+
echo "#!/bin/sh
|
32
|
+
|
33
|
+
##
|
34
|
+
## Generated by autogen.sh
|
35
|
+
##
|
36
|
+
|
37
|
+
version=\`cat VERSION\`
|
38
|
+
dst=fluentd-\$version
|
39
|
+
rm -rf \$dst
|
40
|
+
mkdir \$dst || exit 1
|
41
|
+
cp -fpR lib bin \$dst/ || exit 1
|
42
|
+
mkdir -p \$dst/deps || exit 1
|
43
|
+
cp deps/*.gem deps/ruby-*.tar.bz2 \$dst/deps/
|
44
|
+
cp README.rdoc README COPYING NEWS ChangeLog AUTHORS INSTALL NOTICE \\
|
45
|
+
configure.in Makefile.in Makefile.am configure aclocal.m4 \\
|
46
|
+
Rakefile VERSION fluent.conf make_dist.sh \\
|
47
|
+
\$dst/ || exit 1
|
48
|
+
cp -f README.rdoc \$dst/README || exit 1
|
49
|
+
mkdir -p \$dst/ac || exit 1
|
50
|
+
cp ac/* \$dst/ac/ || exit 1
|
51
|
+
tar czvf \$dst.tar.gz \$dst || exit 1
|
52
|
+
rm -rf \$dst
|
53
|
+
" > make_dist.sh
|
54
|
+
chmod 755 make_dist.sh
|
55
|
+
|
56
|
+
if [ x`uname` = x"Darwin" ]; then
|
57
|
+
glibtoolize --force --copy
|
58
|
+
else
|
59
|
+
libtoolize --force --copy
|
60
|
+
fi
|
61
|
+
aclocal
|
62
|
+
#autoheader
|
63
|
+
automake --add-missing --copy
|
64
|
+
autoconf
|
65
|
+
|
66
|
+
rmdir deps/ruby 2>/dev/null
|
67
|
+
|
data/configure.in
ADDED
@@ -0,0 +1,52 @@
|
|
1
|
+
AC_INIT(lib/fluent/engine.rb)
|
2
|
+
AC_CONFIG_AUX_DIR(ac)
|
3
|
+
AM_INIT_AUTOMAKE(fluentd, 0.10.3)
|
4
|
+
|
5
|
+
AC_CHECK_LIB(z,deflate,,
|
6
|
+
AC_MSG_ERROR([zlib library not found]))
|
7
|
+
|
8
|
+
AC_CHECK_HEADERS(openssl/sha.h,,
|
9
|
+
AC_MSG_ERROR([find openssl header not found]))
|
10
|
+
AC_CHECK_LIB(crypto,SHA1,,
|
11
|
+
AC_MSG_ERROR([openssl library not found]))
|
12
|
+
|
13
|
+
#AC_CONFIG_SUBDIRS([deps/ruby])
|
14
|
+
|
15
|
+
orig_exec_prefix=$exec_prefix
|
16
|
+
orig_prefix=$prefix
|
17
|
+
|
18
|
+
if test "$prefix" = "NONE"; then
|
19
|
+
prefix=$ac_default_prefix
|
20
|
+
fi
|
21
|
+
exec_prefix=$prefix
|
22
|
+
ruby_prefix=`eval echo $libdir/fluent/ruby`
|
23
|
+
|
24
|
+
exec_prefix=$orig_exec_prefix
|
25
|
+
prefix=$orig_prefix
|
26
|
+
|
27
|
+
AC_SUBST(RUBY_PREFIX)
|
28
|
+
AC_SUBST(RUBY_BINDIR)
|
29
|
+
AC_SUBST(RUBY_LIBDIR)
|
30
|
+
RUBY_PREFIX=$ruby_prefix
|
31
|
+
RUBY_BINDIR=$ruby_prefix/bin
|
32
|
+
RUBY_LIBDIR=$ruby_prefix/lib
|
33
|
+
|
34
|
+
AC_OUTPUT([Makefile])
|
35
|
+
|
36
|
+
if test ! -d deps/ruby; then
|
37
|
+
mkdir -p deps/ruby-extract
|
38
|
+
tar jxf deps/ruby-*.tar.bz2 -C deps/ruby-extract
|
39
|
+
mv deps/ruby-extract/* deps/ruby
|
40
|
+
fi
|
41
|
+
|
42
|
+
cd deps/ruby && ./configure "--prefix=$ruby_prefix" \
|
43
|
+
--disable-install-doc \
|
44
|
+
--with-out-ext=dbm \
|
45
|
+
--with-out-ext=fiddle \
|
46
|
+
--with-out-ext=gdbm \
|
47
|
+
--with-out-ext=probe \
|
48
|
+
--with-out-ext=racc \
|
49
|
+
--with-out-ext=ripper \
|
50
|
+
--with-out-ext=sdbm \
|
51
|
+
--with-out-ext=tk
|
52
|
+
|
data/fluentd.gemspec
CHANGED
@@ -1,119 +1,40 @@
|
|
1
|
-
#
|
2
|
-
|
3
|
-
# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
|
4
|
-
# -*- encoding: utf-8 -*-
|
1
|
+
# encoding: utf-8
|
2
|
+
$:.push File.expand_path('../lib', __FILE__)
|
5
3
|
|
6
|
-
Gem::Specification.new do |
|
7
|
-
|
8
|
-
|
4
|
+
Gem::Specification.new do |gem|
|
5
|
+
version_file = "lib/fluent/version.rb"
|
6
|
+
version = File.read("VERSION").strip
|
7
|
+
File.open(version_file, "w") {|f|
|
8
|
+
f.write <<EOF
|
9
|
+
module Fluent
|
9
10
|
|
10
|
-
|
11
|
-
s.authors = ["Sadayuki Furuhashi"]
|
12
|
-
s.date = %q{2011-10-21}
|
13
|
-
s.email = %q{frsyuki@gmail.com}
|
14
|
-
s.executables = ["fluentd", "fluent-cat", "fluent-gem"]
|
15
|
-
s.extra_rdoc_files = [
|
16
|
-
"ChangeLog",
|
17
|
-
"README.rdoc"
|
18
|
-
]
|
19
|
-
s.files = [
|
20
|
-
"AUTHORS",
|
21
|
-
"COPYING",
|
22
|
-
"Rakefile",
|
23
|
-
"VERSION",
|
24
|
-
"bin/fluent-cat",
|
25
|
-
"bin/fluent-gem",
|
26
|
-
"bin/fluentd",
|
27
|
-
"fluent.conf",
|
28
|
-
"fluentd.gemspec",
|
29
|
-
"lib/fluent/buffer.rb",
|
30
|
-
"lib/fluent/command/cat.rb",
|
31
|
-
"lib/fluent/command/fluentd.rb",
|
32
|
-
"lib/fluent/config.rb",
|
33
|
-
"lib/fluent/engine.rb",
|
34
|
-
"lib/fluent/env.rb",
|
35
|
-
"lib/fluent/event.rb",
|
36
|
-
"lib/fluent/input.rb",
|
37
|
-
"lib/fluent/load.rb",
|
38
|
-
"lib/fluent/log.rb",
|
39
|
-
"lib/fluent/match.rb",
|
40
|
-
"lib/fluent/mixin.rb",
|
41
|
-
"lib/fluent/output.rb",
|
42
|
-
"lib/fluent/parser.rb",
|
43
|
-
"lib/fluent/plugin.rb",
|
44
|
-
"lib/fluent/plugin/buf_file.rb",
|
45
|
-
"lib/fluent/plugin/buf_memory.rb",
|
46
|
-
"lib/fluent/plugin/buf_zfile.rb",
|
47
|
-
"lib/fluent/plugin/in_http.rb",
|
48
|
-
"lib/fluent/plugin/in_stream.rb",
|
49
|
-
"lib/fluent/plugin/in_syslog.rb",
|
50
|
-
"lib/fluent/plugin/in_tail.rb",
|
51
|
-
"lib/fluent/plugin/out_copy.rb",
|
52
|
-
"lib/fluent/plugin/out_file.rb",
|
53
|
-
"lib/fluent/plugin/out_null.rb",
|
54
|
-
"lib/fluent/plugin/out_roundrobin.rb",
|
55
|
-
"lib/fluent/plugin/out_stdout.rb",
|
56
|
-
"lib/fluent/plugin/out_stream.rb",
|
57
|
-
"lib/fluent/plugin/out_test.rb",
|
58
|
-
"lib/fluent/test.rb",
|
59
|
-
"lib/fluent/test/base.rb",
|
60
|
-
"lib/fluent/test/input_test.rb",
|
61
|
-
"lib/fluent/test/output_test.rb",
|
62
|
-
"lib/fluent/version.rb",
|
63
|
-
"test/config.rb",
|
64
|
-
"test/helper.rb",
|
65
|
-
"test/match.rb",
|
66
|
-
"test/plugin/in_http.rb",
|
67
|
-
"test/plugin/in_stream.rb",
|
68
|
-
"test/plugin/out_copy.rb",
|
69
|
-
"test/plugin/out_file.rb",
|
70
|
-
"test/plugin/out_roundrobin.rb",
|
71
|
-
"test/plugin/out_stream.rb"
|
72
|
-
]
|
73
|
-
s.homepage = %q{http://fluentd.org/}
|
74
|
-
s.rdoc_options = ["--charset=UTF-8"]
|
75
|
-
s.require_paths = ["lib"]
|
76
|
-
s.required_ruby_version = Gem::Requirement.new("~> 1.9.2")
|
77
|
-
s.rubygems_version = %q{1.3.7}
|
78
|
-
s.summary = %q{Fluent event collector}
|
79
|
-
s.test_files = [
|
80
|
-
"test/config.rb",
|
81
|
-
"test/helper.rb",
|
82
|
-
"test/match.rb",
|
83
|
-
"test/plugin/in_http.rb",
|
84
|
-
"test/plugin/in_stream.rb",
|
85
|
-
"test/plugin/out_copy.rb",
|
86
|
-
"test/plugin/out_file.rb",
|
87
|
-
"test/plugin/out_roundrobin.rb",
|
88
|
-
"test/plugin/out_stream.rb"
|
89
|
-
]
|
11
|
+
VERSION = '#{version}'
|
90
12
|
|
91
|
-
if s.respond_to? :specification_version then
|
92
|
-
current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
|
93
|
-
s.specification_version = 3
|
94
|
-
|
95
|
-
if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
|
96
|
-
s.add_runtime_dependency(%q<msgpack>, ["~> 0.4.4"])
|
97
|
-
s.add_runtime_dependency(%q<json>, [">= 1.4.3"])
|
98
|
-
s.add_runtime_dependency(%q<yajl-ruby>, ["~> 1.0.0"])
|
99
|
-
s.add_runtime_dependency(%q<cool.io>, ["~> 1.0.0"])
|
100
|
-
s.add_runtime_dependency(%q<http_parser.rb>, ["~> 0.5.1"])
|
101
|
-
s.add_runtime_dependency(%q<rake>, [">= 0.9.2"])
|
102
|
-
else
|
103
|
-
s.add_dependency(%q<msgpack>, ["~> 0.4.4"])
|
104
|
-
s.add_dependency(%q<json>, [">= 1.4.3"])
|
105
|
-
s.add_dependency(%q<yajl-ruby>, ["~> 1.0.0"])
|
106
|
-
s.add_dependency(%q<cool.io>, ["~> 1.0.0"])
|
107
|
-
s.add_dependency(%q<http_parser.rb>, ["~> 0.5.1"])
|
108
|
-
s.add_dependency(%q<rake>, [">= 0.9.2"])
|
109
|
-
end
|
110
|
-
else
|
111
|
-
s.add_dependency(%q<msgpack>, ["~> 0.4.4"])
|
112
|
-
s.add_dependency(%q<json>, [">= 1.4.3"])
|
113
|
-
s.add_dependency(%q<yajl-ruby>, ["~> 1.0.0"])
|
114
|
-
s.add_dependency(%q<cool.io>, ["~> 1.0.0"])
|
115
|
-
s.add_dependency(%q<http_parser.rb>, ["~> 0.5.1"])
|
116
|
-
s.add_dependency(%q<rake>, [">= 0.9.2"])
|
117
|
-
end
|
118
13
|
end
|
14
|
+
EOF
|
15
|
+
}
|
16
|
+
|
17
|
+
gem.name = %q{fluentd}
|
18
|
+
gem.version = version
|
19
|
+
# gem.platform = Gem::Platform::RUBY
|
20
|
+
gem.authors = ["Sadayuki Furuhashi"]
|
21
|
+
gem.email = %q{frsyuki@gmail.com}
|
22
|
+
gem.description = "Fluent event collector"
|
23
|
+
gem.summary = gem.description
|
24
|
+
|
25
|
+
gem.homepage = "http://fluentd.org/"
|
26
|
+
gem.has_rdoc = false
|
27
|
+
gem.files = `git ls-files`.split("\n")
|
28
|
+
gem.test_files = `git ls-files -- {test,spec,features}/*`.split("\n")
|
29
|
+
gem.executables = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
|
30
|
+
gem.require_paths = ['lib']
|
119
31
|
|
32
|
+
gem.required_ruby_version = '~> 1.9.2'
|
33
|
+
|
34
|
+
gem.add_dependency "msgpack", "~> 0.4.4"
|
35
|
+
gem.add_dependency "json", ">= 1.4.3"
|
36
|
+
gem.add_dependency "yajl-ruby", "~> 1.0.0"
|
37
|
+
gem.add_dependency "cool.io", "~> 1.0.0"
|
38
|
+
gem.add_dependency "http_parser.rb", "~> 0.5.1"
|
39
|
+
gem.add_dependency "rake", ">= 0.9.2"
|
40
|
+
end
|
data/lib/fluent/engine.rb
CHANGED
@@ -91,24 +91,28 @@ class EngineClass
|
|
91
91
|
end
|
92
92
|
|
93
93
|
def emit_stream(tag, es)
|
94
|
-
|
95
|
-
unless
|
96
|
-
|
94
|
+
target = @match_cache[tag]
|
95
|
+
unless target
|
96
|
+
target = match(tag) || NoMatchMatch.new
|
97
97
|
if @match_cache.size < 1024 # TODO size limit
|
98
|
-
@match_cache[tag] =
|
98
|
+
@match_cache[tag] = target
|
99
99
|
end
|
100
100
|
end
|
101
|
-
|
101
|
+
target.emit(tag, es)
|
102
102
|
rescue
|
103
103
|
$log.warn "emit transaction faild ", :error=>$!.to_s
|
104
104
|
$log.warn_backtrace
|
105
105
|
raise
|
106
106
|
end
|
107
107
|
|
108
|
-
def match
|
108
|
+
def match(tag)
|
109
109
|
@matches.find {|m| m.match(tag) }
|
110
110
|
end
|
111
111
|
|
112
|
+
def match?(tag)
|
113
|
+
!!match(tag)
|
114
|
+
end
|
115
|
+
|
112
116
|
def flush!
|
113
117
|
flush_recursive(@matches)
|
114
118
|
end
|
@@ -23,23 +23,13 @@ class FileBufferChunk < BufferChunk
|
|
23
23
|
super(key)
|
24
24
|
@path = path
|
25
25
|
@file = File.open(@path, mode)
|
26
|
+
@file.sync = true
|
26
27
|
@size = @file.stat.size
|
27
28
|
end
|
28
29
|
|
29
30
|
def <<(data)
|
30
|
-
|
31
|
-
|
32
|
-
@size += n
|
33
|
-
if data.bytesize <= n
|
34
|
-
break
|
35
|
-
else
|
36
|
-
data = data[n..-1]
|
37
|
-
#data.slice!(0, n-1)
|
38
|
-
end
|
39
|
-
end
|
40
|
-
#@file.write(data)
|
41
|
-
#@size += data.bytesize
|
42
|
-
#@file.flush
|
31
|
+
@file.write(data)
|
32
|
+
@size += data.bytesize
|
43
33
|
end
|
44
34
|
|
45
35
|
def size
|
data/lib/fluent/test/base.rb
CHANGED
data/lib/fluent/version.rb
CHANGED
data/test/plugin/in_stream.rb
CHANGED
@@ -74,6 +74,22 @@ module StreamInputTest
|
|
74
74
|
end
|
75
75
|
end
|
76
76
|
|
77
|
+
def test_message_json
|
78
|
+
d = create_driver
|
79
|
+
|
80
|
+
time = Time.parse("2011-01-02 13:14:15 UTC").to_i
|
81
|
+
|
82
|
+
d.expect_emit "tag1", time, {"a"=>1}
|
83
|
+
d.expect_emit "tag2", time, {"a"=>2}
|
84
|
+
|
85
|
+
d.run do
|
86
|
+
d.expected_emits.each {|tag,time,record|
|
87
|
+
send_data [tag, time, record].to_json
|
88
|
+
}
|
89
|
+
sleep 0.5
|
90
|
+
end
|
91
|
+
end
|
92
|
+
|
77
93
|
def create_driver(klass, conf)
|
78
94
|
Fluent::Test::InputTestDriver.new(klass).configure(conf)
|
79
95
|
end
|
metadata
CHANGED
@@ -1,138 +1,106 @@
|
|
1
|
-
--- !ruby/object:Gem::Specification
|
1
|
+
--- !ruby/object:Gem::Specification
|
2
2
|
name: fluentd
|
3
|
-
version: !ruby/object:Gem::Version
|
4
|
-
|
5
|
-
prerelease:
|
6
|
-
segments:
|
7
|
-
- 0
|
8
|
-
- 10
|
9
|
-
- 3
|
10
|
-
version: 0.10.3
|
3
|
+
version: !ruby/object:Gem::Version
|
4
|
+
version: 0.10.4
|
5
|
+
prerelease:
|
11
6
|
platform: ruby
|
12
|
-
authors:
|
7
|
+
authors:
|
13
8
|
- Sadayuki Furuhashi
|
14
9
|
autorequire:
|
15
10
|
bindir: bin
|
16
11
|
cert_chain: []
|
17
|
-
|
18
|
-
|
19
|
-
|
20
|
-
dependencies:
|
21
|
-
- !ruby/object:Gem::Dependency
|
12
|
+
date: 2011-11-07 00:00:00.000000000Z
|
13
|
+
dependencies:
|
14
|
+
- !ruby/object:Gem::Dependency
|
22
15
|
name: msgpack
|
23
|
-
|
24
|
-
requirement: &id001 !ruby/object:Gem::Requirement
|
16
|
+
requirement: &70328114885780 !ruby/object:Gem::Requirement
|
25
17
|
none: false
|
26
|
-
requirements:
|
18
|
+
requirements:
|
27
19
|
- - ~>
|
28
|
-
- !ruby/object:Gem::Version
|
29
|
-
hash: 7
|
30
|
-
segments:
|
31
|
-
- 0
|
32
|
-
- 4
|
33
|
-
- 4
|
20
|
+
- !ruby/object:Gem::Version
|
34
21
|
version: 0.4.4
|
35
22
|
type: :runtime
|
36
|
-
version_requirements: *id001
|
37
|
-
- !ruby/object:Gem::Dependency
|
38
|
-
name: json
|
39
23
|
prerelease: false
|
40
|
-
|
24
|
+
version_requirements: *70328114885780
|
25
|
+
- !ruby/object:Gem::Dependency
|
26
|
+
name: json
|
27
|
+
requirement: &70328114885300 !ruby/object:Gem::Requirement
|
41
28
|
none: false
|
42
|
-
requirements:
|
43
|
-
- -
|
44
|
-
- !ruby/object:Gem::Version
|
45
|
-
hash: 1
|
46
|
-
segments:
|
47
|
-
- 1
|
48
|
-
- 4
|
49
|
-
- 3
|
29
|
+
requirements:
|
30
|
+
- - ! '>='
|
31
|
+
- !ruby/object:Gem::Version
|
50
32
|
version: 1.4.3
|
51
33
|
type: :runtime
|
52
|
-
version_requirements: *id002
|
53
|
-
- !ruby/object:Gem::Dependency
|
54
|
-
name: yajl-ruby
|
55
34
|
prerelease: false
|
56
|
-
|
35
|
+
version_requirements: *70328114885300
|
36
|
+
- !ruby/object:Gem::Dependency
|
37
|
+
name: yajl-ruby
|
38
|
+
requirement: &70328114884800 !ruby/object:Gem::Requirement
|
57
39
|
none: false
|
58
|
-
requirements:
|
40
|
+
requirements:
|
59
41
|
- - ~>
|
60
|
-
- !ruby/object:Gem::Version
|
61
|
-
hash: 23
|
62
|
-
segments:
|
63
|
-
- 1
|
64
|
-
- 0
|
65
|
-
- 0
|
42
|
+
- !ruby/object:Gem::Version
|
66
43
|
version: 1.0.0
|
67
44
|
type: :runtime
|
68
|
-
version_requirements: *id003
|
69
|
-
- !ruby/object:Gem::Dependency
|
70
|
-
name: cool.io
|
71
45
|
prerelease: false
|
72
|
-
|
46
|
+
version_requirements: *70328114884800
|
47
|
+
- !ruby/object:Gem::Dependency
|
48
|
+
name: cool.io
|
49
|
+
requirement: &70328114884280 !ruby/object:Gem::Requirement
|
73
50
|
none: false
|
74
|
-
requirements:
|
51
|
+
requirements:
|
75
52
|
- - ~>
|
76
|
-
- !ruby/object:Gem::Version
|
77
|
-
hash: 23
|
78
|
-
segments:
|
79
|
-
- 1
|
80
|
-
- 0
|
81
|
-
- 0
|
53
|
+
- !ruby/object:Gem::Version
|
82
54
|
version: 1.0.0
|
83
55
|
type: :runtime
|
84
|
-
version_requirements: *id004
|
85
|
-
- !ruby/object:Gem::Dependency
|
86
|
-
name: http_parser.rb
|
87
56
|
prerelease: false
|
88
|
-
|
57
|
+
version_requirements: *70328114884280
|
58
|
+
- !ruby/object:Gem::Dependency
|
59
|
+
name: http_parser.rb
|
60
|
+
requirement: &70328114883780 !ruby/object:Gem::Requirement
|
89
61
|
none: false
|
90
|
-
requirements:
|
62
|
+
requirements:
|
91
63
|
- - ~>
|
92
|
-
- !ruby/object:Gem::Version
|
93
|
-
hash: 9
|
94
|
-
segments:
|
95
|
-
- 0
|
96
|
-
- 5
|
97
|
-
- 1
|
64
|
+
- !ruby/object:Gem::Version
|
98
65
|
version: 0.5.1
|
99
66
|
type: :runtime
|
100
|
-
version_requirements: *id005
|
101
|
-
- !ruby/object:Gem::Dependency
|
102
|
-
name: rake
|
103
67
|
prerelease: false
|
104
|
-
|
68
|
+
version_requirements: *70328114883780
|
69
|
+
- !ruby/object:Gem::Dependency
|
70
|
+
name: rake
|
71
|
+
requirement: &70328114883300 !ruby/object:Gem::Requirement
|
105
72
|
none: false
|
106
|
-
requirements:
|
107
|
-
- -
|
108
|
-
- !ruby/object:Gem::Version
|
109
|
-
hash: 63
|
110
|
-
segments:
|
111
|
-
- 0
|
112
|
-
- 9
|
113
|
-
- 2
|
73
|
+
requirements:
|
74
|
+
- - ! '>='
|
75
|
+
- !ruby/object:Gem::Version
|
114
76
|
version: 0.9.2
|
115
77
|
type: :runtime
|
116
|
-
|
117
|
-
|
78
|
+
prerelease: false
|
79
|
+
version_requirements: *70328114883300
|
80
|
+
description: Fluent event collector
|
118
81
|
email: frsyuki@gmail.com
|
119
|
-
executables:
|
120
|
-
- fluentd
|
82
|
+
executables:
|
121
83
|
- fluent-cat
|
122
84
|
- fluent-gem
|
85
|
+
- fluentd
|
123
86
|
extensions: []
|
124
|
-
|
125
|
-
|
126
|
-
-
|
127
|
-
-
|
128
|
-
files:
|
87
|
+
extra_rdoc_files: []
|
88
|
+
files:
|
89
|
+
- .gitignore
|
90
|
+
- .rvmrc
|
129
91
|
- AUTHORS
|
130
92
|
- COPYING
|
93
|
+
- ChangeLog
|
94
|
+
- Gemfile
|
95
|
+
- Makefile.am
|
96
|
+
- README.rdoc
|
131
97
|
- Rakefile
|
132
98
|
- VERSION
|
99
|
+
- autogen.sh
|
133
100
|
- bin/fluent-cat
|
134
101
|
- bin/fluent-gem
|
135
102
|
- bin/fluentd
|
103
|
+
- configure.in
|
136
104
|
- fluent.conf
|
137
105
|
- fluentd.gemspec
|
138
106
|
- lib/fluent/buffer.rb
|
@@ -178,45 +146,34 @@ files:
|
|
178
146
|
- test/plugin/out_file.rb
|
179
147
|
- test/plugin/out_roundrobin.rb
|
180
148
|
- test/plugin/out_stream.rb
|
181
|
-
- ChangeLog
|
182
|
-
- README.rdoc
|
183
|
-
has_rdoc: true
|
184
149
|
homepage: http://fluentd.org/
|
185
150
|
licenses: []
|
186
|
-
|
187
151
|
post_install_message:
|
188
|
-
rdoc_options:
|
189
|
-
|
190
|
-
require_paths:
|
152
|
+
rdoc_options: []
|
153
|
+
require_paths:
|
191
154
|
- lib
|
192
|
-
required_ruby_version: !ruby/object:Gem::Requirement
|
155
|
+
required_ruby_version: !ruby/object:Gem::Requirement
|
193
156
|
none: false
|
194
|
-
requirements:
|
157
|
+
requirements:
|
195
158
|
- - ~>
|
196
|
-
- !ruby/object:Gem::Version
|
197
|
-
hash: 55
|
198
|
-
segments:
|
199
|
-
- 1
|
200
|
-
- 9
|
201
|
-
- 2
|
159
|
+
- !ruby/object:Gem::Version
|
202
160
|
version: 1.9.2
|
203
|
-
required_rubygems_version: !ruby/object:Gem::Requirement
|
161
|
+
required_rubygems_version: !ruby/object:Gem::Requirement
|
204
162
|
none: false
|
205
|
-
requirements:
|
206
|
-
- -
|
207
|
-
- !ruby/object:Gem::Version
|
208
|
-
|
209
|
-
segments:
|
163
|
+
requirements:
|
164
|
+
- - ! '>='
|
165
|
+
- !ruby/object:Gem::Version
|
166
|
+
version: '0'
|
167
|
+
segments:
|
210
168
|
- 0
|
211
|
-
|
169
|
+
hash: -3274384045168795718
|
212
170
|
requirements: []
|
213
|
-
|
214
171
|
rubyforge_project:
|
215
|
-
rubygems_version: 1.
|
172
|
+
rubygems_version: 1.8.10
|
216
173
|
signing_key:
|
217
174
|
specification_version: 3
|
218
175
|
summary: Fluent event collector
|
219
|
-
test_files:
|
176
|
+
test_files:
|
220
177
|
- test/config.rb
|
221
178
|
- test/helper.rb
|
222
179
|
- test/match.rb
|