Skip to content

Commit 953caa3

Browse files
daipomkenhys
authored andcommitted
use Fluentd for the feature (#700)
Use this to test this feature. * fluent/fluentd#4624 Signed-off-by: Daijiro Fukuda <fukuda@clear-code.com>
1 parent 4ba7f76 commit 953caa3

File tree

4 files changed

+10
-8
lines changed

4 files changed

+10
-8
lines changed

fluent-package/Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ gem "cool.io", "1.8.1", platforms: no_fat_gem
1313
gem "sigdump", "0.2.5"
1414
gem "http_parser.rb", "0.8.0"
1515
gem "yajl-ruby", "1.4.3"
16-
gem "serverengine", '2.3.2'
16+
gem "serverengine", '2.4.0'
1717
gem "msgpack", "1.7.2"
1818
gem "oj", "3.16.4"
1919
gem "tzinfo", "2.0.6"

fluent-package/Gemfile.lock

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ GIT
99

1010
GIT
1111
remote: https://github.com/fluent/fluentd
12-
revision: e763c0761c44d9734b6aa374371387a2e8406522
13-
ref: e763c0761c44d9734b6aa374371387a2e8406522
12+
revision: f8755d09b747d054302c0e12a3b0962a11f1045e
13+
ref: f8755d09b747d054302c0e12a3b0962a11f1045e
1414
specs:
15-
fluentd (1.17.0)
15+
fluentd (1.17.1)
1616
base64 (~> 0.2)
1717
bundler
1818
certstore_c (~> 0.1.7)
@@ -236,7 +236,9 @@ GEM
236236
digest-crc
237237
ruby-progressbar (1.13.0)
238238
rubyzip (1.3.0)
239-
serverengine (2.3.2)
239+
serverengine (2.4.0)
240+
base64 (~> 0.1)
241+
logger (~> 1.4)
240242
sigdump (~> 0.2.2)
241243
sigdump (0.2.5)
242244
strptime (0.2.5)
@@ -337,7 +339,7 @@ DEPENDENCIES
337339
rake
338340
rdkafka (= 0.16.1)
339341
ruby-kafka (= 1.5.0)
340-
serverengine (= 2.3.2)
342+
serverengine (= 2.4.0)
341343
sigdump (= 0.2.5)
342344
systemd-journal (= 1.4.2)
343345
td (= 0.17.1)

fluent-package/Rakefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ def extract_fluentd_version(archive_path)
157157
File.basename(archive_path, ".tar.gz"))
158158
Dir.chdir(archive_dir) do
159159
IO.popen("git tag --contains #{FLUENTD_REVISION}") do |tags|
160-
fluentd_version = tags.readlines.last.chomp.delete_prefix("v")
160+
fluentd_version = tags.readlines.last&.chomp&.delete_prefix("v") || ""
161161
end
162162
end
163163
puts "::endgroup::" if ENV["CI"]

fluent-package/config.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
PACKAGE_DIR = "fluent"
88
COMPAT_PACKAGE_DIR = COMPAT_SERVICE_NAME
99

10-
FLUENTD_REVISION = 'e763c0761c44d9734b6aa374371387a2e8406522' # v1.17.0
10+
FLUENTD_REVISION = 'f8755d09b747d054302c0e12a3b0962a11f1045e' # test no-downtime (TODO fix later)
1111
FLUENTD_LOCAL_GEM_REPO = "file://" + File.expand_path(File.join(__dir__, "local_gem_repo"))
1212

1313
# https://github.com/jemalloc/jemalloc/releases

0 commit comments

Comments
 (0)