lib/fluent/plugin/buf_file.rb in fluentd-0.10.57 vs lib/fluent/plugin/buf_file.rb in fluentd-0.10.58

@@ -89,13 +89,13 @@
 
     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]
@@ -110,10 +110,10 @@
         @flush_at_shutdown = false
       end
     end
 
     def start
-      FileUtils.mkdir_p File.dirname(@buffer_path_prefix+"path")
+      FileUtils.mkdir_p File.dirname(@buffer_path_prefix + "path"), :mode => DEFAULT_DIR_PERMISSION
       super
     end
 
     PATH_MATCH = /^(.*)[\._](b|q)([0-9a-fA-F]{1,32})$/