simplify argument check and add raising error for unexpected type

fluent · Mar 29, 2016 · 4d29491 · 4d29491
1 parent a63ee6c
commit 4d29491
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/lib/fluent/plugin_helper/storage.rb b/lib/fluent/plugin_helper/storage.rb
@@ -41,13 +41,16 @@ def storage_create(usage: '', type: nil, conf: nil)
           end
           storage = Plugin.new_storage(type)
           storage.owner = self
-          config = if conf && conf.is_a?(Fluent::Config::Element)
+          config = case conf
+                   when Fluent::Config::Element
                      conf
-                   elsif conf && conf.is_a?(Hash)
+                   when Hash
                      conf = Hash[conf.map{|k,v| [k.to_s, v]}]
                      Fluent::Config::Element.new('storage', '', conf, [])
-                   else
+                   when nil
                      Fluent::Config::Element.new('storage', '', {}, [])
+                   else
+                     raise ArgumentError, "BUG: conf must be a Element, Hash (or unspecified), but '#{conf.class}'"
                    end
           storage.configure(config)
           s = @_storages[usage] = StorageState.new(wrap_instance(storage), false)