fluent-plugin-file-alternative 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ea52057a062ad50131a6e1cf865c06c7bb8b69d2
-  data.tar.gz: efd08dcdc758d6f6ffab1b1767ecf613ea9a7cc9
+  metadata.gz: d3796ea866576055a4dbef203334e70d6df34a31
+  data.tar.gz: 1f555bcb055ca5afdfc8bc263d0c1e564cceee4c
 SHA512:
-  metadata.gz: c78ef8f78cb7cbaf29ae78287beaba67d6267624599b3116bf9aa69050a158175e5fba4ec50c125ed9adb1a959f398dd20e55aa0e32d6b231b651023e9bb6f30
-  data.tar.gz: 3d618956f885a15c80984cec1da9425783e8332fa3912bc0218e56e3b6c5d8a30a705865e271cc9c02055b1279d1affe0819d2dd0e116616bbd9f2590ed67f3f
+  metadata.gz: c8bf1e6f664ad3e757e9a7e529f029ae3a72c962668549ed0c7225dcdfc5c8f3bc790a91d990edb01b7eba46b63d4dc4b230aef4185f9b01e105e3f01fcd2cc8
+  data.tar.gz: ea189049c4a6d50aef172d5d5fcff3fc25b6b36f6d9299c14a4ee394082e60a09d5e7e4e952c42aeec9bd902ed4d2a2303c8e2c633b64fe7c49066cdfd4f4c59

data/fluent-plugin-file-alternative.gemspec

@@ -2,14 +2,14 @@
 
 Gem::Specification.new do |gem|
   gem.name          = "fluent-plugin-file-alternative"
-  gem.version       = "0.2.0"
+  gem.version       = "0.2.1"
 
   gem.authors       = ["TAGOMORI Satoshi"]
   gem.email         = ["tagomoris@gmail.com"]
   gem.description   = %q{alternative implementation of out_file, with various configurations}
   gem.summary       = %q{alternative implementation of out_file}
   gem.homepage      = "https://github.com/tagomoris/fluent-plugin-file-alternative"
-  gem.license       = "APLv2"
+  gem.license       = "Apache-2.0"
 
   gem.files         = `git ls-files`.split($\)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }

data/lib/fluent/plugin/out_file_alternative.rb

@@ -29,6 +29,8 @@ class Fluent::FileAlternativeOutput < Fluent::TimeSlicedOutput
 
   config_param :dir_mode, :string, :default => '0777'
 
+  config_param :set_dir_mode, :bool, :default => true
+
   include Fluent::Mixin::PlainTextFormatter
 
   def initialize
@@ -139,7 +141,9 @@ class Fluent::FileAlternativeOutput < Fluent::TimeSlicedOutput
 
       Pathname.new(path).descend {|p|
         FileUtils.mkdir_p( File.dirname(p)) unless File.directory?(p)
-        FileUtils.chmod @dir_mode.to_i(8), File.dirname(p) unless File.directory?(p)
+        if @set_dir_mode
+          FileUtils.chmod @dir_mode.to_i(8), File.dirname(p) unless File.directory?(p)
+        end
       }
 
       case @compress

data/test/plugin/test_out_file_alternative.rb

@@ -135,6 +135,7 @@ class FileAlternativeOutputTest < Test::Unit::TestCase
     d4 = create_driver %[
       path #{TMP_DIR}/path_to_test/%Y/%m/%d/accesslog.%Y-%m-%d-%H-%M-%S
       dir_mode 0700
+      utc
     ]
 
     time = Time.parse("2011-01-02 13:14:15 UTC").to_i
@@ -172,4 +173,21 @@ class FileAlternativeOutputTest < Test::Unit::TestCase
     end
   end
 
+  def test_disable_chmod
+    d = create_driver %{
+      path #{TMP_DIR}/path_to_test/%Y/%m/%d/accesslog.%Y-%m-%d-%H-%M-%S
+      dir_mode 0700
+      set_dir_mode false
+      utc
+    }
+    time = Time.parse("2011-01-02 13:14:15 UTC").to_i
+    d.emit({"server" => "www01", "level" => "warn", "log" => "Exception\n"}, time)
+    # directory's permission should follow umask, even dir_mode specified
+    dir_mask = (040777 ^ File.umask).to_s(8)
+    path = d.run
+    assert_equal dir_mask, File.stat(File.dirname(File.dirname(File.dirname(path[0])))).mode.to_s(8)
+    assert_equal dir_mask, File.stat(File.dirname(File.dirname(path[0]))).mode.to_s(8)
+    assert_equal dir_mask, File.stat(File.dirname(path[0])).mode.to_s(8)
+  end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-file-alternative
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - TAGOMORI Satoshi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-16 00:00:00.000000000 Z
+date: 2015-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -85,7 +85,7 @@ files:
 - test/plugin/test_out_file_alternative.rb
 homepage: https://github.com/tagomoris/fluent-plugin-file-alternative
 licenses:
-- APLv2
+- Apache-2.0
 metadata: {}
 post_install_message: 
 rdoc_options: []