Make conpatible for Fluentd v1.8

uken · Dec 3, 2019 · fc15153 · fc15153
1 parent 6c3533e
commit fc15153
Showing 1 changed file with 11 additions and 3 deletions.
diff --git a/lib/fluent/plugin/out_elasticsearch.rb b/lib/fluent/plugin/out_elasticsearch.rb
@@ -204,7 +204,7 @@ def configure(conf)
       end
 
       @alias_indexes = []
-      if !Fluent::Engine.dry_run_mode
+      if !dry_run?
         if @template_name && @template_file
           if @rollover_index
             raise Fluent::ConfigError, "'deflector_alias' must be provided if 'rollover_index' is set true ." if not @deflector_alias
@@ -257,7 +257,7 @@ def configure(conf)
       end
 
       @last_seen_major_version =
-        if @verify_es_version_at_startup && !Fluent::Engine.dry_run_mode
+        if @verify_es_version_at_startup && !dry_run?
           retry_operate(@max_retry_get_es_version) do
             detect_es_major_version
           end
@@ -276,7 +276,7 @@ def configure(conf)
         @type_name = nil
       end
 
-      if @validate_client_version && !Fluent::Engine.dry_run_mode
+      if @validate_client_version && !dry_run?
         if @last_seen_major_version != client_library_version.to_i
           raise Fluent::ConfigError, <<-EOC
             Detected ES #{@last_seen_major_version} but you use ES client #{client_library_version}.
@@ -329,6 +329,14 @@ class << self
       end
     end
 
+    def dry_run?
+      if Fluent::Engine.respond_to?(:dry_run_mode)
+        Fluent::Engine.dry_run_mode
+      elsif Fluent::Engine.respond_to?(:supervisor_mode)
+        Fluent::Engine.supervisor_mode
+      end
+    end
+
     def placeholder?(name, param)
       begin
         placeholder_validate!(name, param)