use ext_monitor before ruby 2.7

Signed-off-by: Yuta Iwama <ganmacs@gmail.com>
fluent · Jan 8, 2020 · d800743 · d800743
1 parent d673f2f
commit d800743
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 5 deletions.
diff --git a/lib/fluent/command/cat.rb b/lib/fluent/command/cat.rb
@@ -103,11 +103,18 @@
 
 
 require 'thread'
-require 'monitor'
 require 'socket'
 require 'yajl'
 require 'msgpack'
 
+if Gem::Version.create(RUBY_VERSION) >= Gem::Version.create('2.7.0')
+  require 'monitor'
+else
+  # monitor_ext is bundled since ruby 2.7.0
+  require 'ext_monitor'
+end
+
+
 
 class Writer
   include MonitorMixin

diff --git a/lib/fluent/load.rb b/lib/fluent/load.rb
@@ -2,7 +2,12 @@
 require 'socket'
 require 'fcntl'
 require 'time'
-require 'monitor'
+if Gem::Version.create(RUBY_VERSION) >= Gem::Version.create('2.7.0')
+  require 'monitor'
+else
+  # monitor_ext is bundled since ruby 2.7.0
+  require 'ext_monitor'
+end
 require 'stringio'
 require 'fileutils'
 require 'json'

diff --git a/lib/fluent/plugin/buffer.rb b/lib/fluent/plugin/buffer.rb
@@ -18,7 +18,12 @@
 require 'fluent/plugin/owned_by_mixin'
 require 'fluent/unique_id'
 
-require 'monitor'
+if Gem::Version.create(RUBY_VERSION) >= Gem::Version.create('2.7.0')
+  require 'monitor'
+else
+  # monitor_ext is bundled since ruby 2.7.0
+  require 'ext_monitor'
+end
 
 module Fluent
   module Plugin

diff --git a/lib/fluent/plugin/buffer/chunk.rb b/lib/fluent/plugin/buffer/chunk.rb
@@ -19,7 +19,13 @@
 require 'fluent/unique_id'
 require 'fluent/event'
 
-require 'monitor'
+if Gem::Version.create(RUBY_VERSION) >= Gem::Version.create('2.7.0')
+  require 'monitor'
+else
+  # monitor_ext is bundled since ruby 2.7.0
+  require 'ext_monitor'
+end
+
 require 'tempfile'
 require 'zlib'
 

diff --git a/lib/fluent/plugin/output.rb b/lib/fluent/plugin/output.rb
@@ -27,7 +27,13 @@
 require 'fluent/clock'
 
 require 'time'
-require 'monitor'
+
+if Gem::Version.create(RUBY_VERSION) >= Gem::Version.create('2.7.0')
+  require 'monitor'
+else
+  # monitor_ext is bundled since ruby 2.7.0
+  require 'ext_monitor'
+end
 
 module Fluent
   module Plugin