lib/fluent/plugin/buf_file.rb in fluentd-0.12.0.pre.3 vs lib/fluent/plugin/buf_file.rb in fluentd-0.12.0
- old
+ new
@@ -91,12 +91,12 @@
def configure(conf)
super
if @@buffer_paths.has_key?(@buffer_path)
- raise ConfigError, "Other '#{@@buffer_paths[@buffer_path]}' plugin already use same buffer_path: type = #{conf['type']}, buffer_path = #{@buffer_path}"
+ raise ConfigError, "Other '#{@@buffer_paths[@buffer_path]}' plugin already use same buffer_path: type = #{conf['@type'] || conf['type']}, buffer_path = #{@buffer_path}"
else
- @@buffer_paths[@buffer_path] = conf['type']
+ @@buffer_paths[@buffer_path] = conf['@type'] || conf['type']
end
if pos = @buffer_path.index('*')
@buffer_path_prefix = @buffer_path[0, pos]
@buffer_path_suffix = @buffer_path[(pos + 1)..-1]