logstash-output-file 2.2.2 → 2.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a764f6a8510cb8b185ca81ec48c9b893473e0313
-  data.tar.gz: a525b4b6f8e3c998a44e4f0ed3d3a5857205a2ba
+  metadata.gz: 5b7121bdf41f7f33e90370360fcbd1156dfd9196
+  data.tar.gz: 26d8d1aaa831354979b9c315ca341bcd0ba438a7
 SHA512:
-  metadata.gz: 1a06888dc105e4f66b6c1e844b547d43c52f65d1a3e478de4f259b00d820b3ad3d6be8530fe05312d43fa36a1d41a733149b16922fad097498f22fa3ddced6fb
-  data.tar.gz: 897c0e4db7c8225958e82750b4fd6b9989ec7738ceca6da9caa63c084ef341fe5217a293ed505ea949f5f0b95af7661fff6e41a52fe2daaba70839852ce51229
+  metadata.gz: 772a0c1c148ab9cd9a9153fefc1dcdb425609a898d967260720c29620651b470ce488fcd1782021180abe241d174c38cefd1d55aa1a255bb1fc11361b10ae92e
+  data.tar.gz: f7bbca5b836c1a4ba89ae022b2ca5f02a510c8c2d4ec1a2fa1bcef6eae545e2b34b64e15c601d93f798b5f7781f9d72b0dc797cd0477f04cc8f0751cb1ad6bcb

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 2.2.3
+  - Rename Dir.exists? to Dir.exist? to fix deprecation warning
+  - Allow setting dir and file permissions
+
 ## 2.2.1
  - Fixed specs to not depend on pipeline ordering
 

data/CONTRIBUTORS

@@ -3,6 +3,7 @@ reports, or in general have helped logstash along its way.
 
 Contributors:
 * Colin Surprenant (colinsurprenant)
+* Ivan Babrou (bobrik)
 * John E. Vincent (lusis)
 * Jordan Sissel (jordansissel)
 * Kayla Green (MixMuffins)

data/lib/logstash/outputs/file.rb

@@ -58,6 +58,18 @@ class LogStash::Outputs::File < LogStash::Outputs::Base
   # in such a file, the plugin will created a gain this file. Default => true
   config :create_if_deleted, :validate => :boolean, :default => true
 
+  # Dir access mode to use. Note that due to the bug in jruby system umask
+  # is ignored on linux: https://github.com/jruby/jruby/issues/3426
+  # Setting it to -1 uses default OS value.
+  # Example: `"dir_mode" => 0750`
+  config :dir_mode, :validate => :number, :default => -1
+
+  # File access mode to use. Note that due to the bug in jruby system umask
+  # is ignored on linux: https://github.com/jruby/jruby/issues/3426
+  # Setting it to -1 uses default OS value.
+  # Example: `"file_mode" => 0640`
+  config :file_mode, :validate => :number, :default => -1
+
   default :codec, "json_lines"
 
   public
@@ -233,16 +245,24 @@ class LogStash::Outputs::File < LogStash::Outputs::Base
     @logger.info("Opening file", :path => path)
 
     dir = File.dirname(path)
-    if !Dir.exists?(dir)
+    if !Dir.exist?(dir)
       @logger.info("Creating directory", :directory => dir)
-      FileUtils.mkdir_p(dir)
+      if @dir_mode != -1
+        FileUtils.mkdir_p(dir, :mode => @dir_mode)
+      else
+        FileUtils.mkdir_p(dir)
+      end
     end
     # work around a bug opening fifos (bug JRUBY-6280)
     stat = File.stat(path) rescue nil
     if stat && stat.ftype == "fifo" && LogStash::Environment.jruby?
       fd = java.io.FileWriter.new(java.io.File.new(path))
     else
-      fd = File.new(path, "a+")
+      if @file_mode != -1
+        fd = File.new(path, "a+", @file_mode)
+      else
+        fd = File.new(path, "a+")
+      end
     end
     if gzip
       fd = Zlib::GzipWriter.new(fd)

data/logstash-output-file.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
 
   s.name            = 'logstash-output-file'
-  s.version         = '2.2.2'
+  s.version         = '2.2.3'
   s.licenses        = ['Apache License (2.0)']
   s.summary         = "This output will write events to files on disk"
   s.description     = "This gem is a logstash plugin required to be installed on top of the Logstash core pipeline using $LS_HOME/bin/plugin install gemname. This gem is not a stand-alone program"

data/spec/outputs/file_spec.rb

@@ -361,6 +361,35 @@ describe LogStash::Outputs::File do
           end
         end
       end
+      context "when using file and dir modes" do
+        it 'dirs and files are created with correct atypical permissions' do
+          good_event = LogStash::Event.new
+          good_event['message'] = "hello world"
+
+          Stud::Temporary.directory do |path|
+            config = {
+              "path"      => "#{path}/is/nested/output.txt",
+              "dir_mode"  => 0751,
+              "file_mode" => 0610,
+            }
+            output = LogStash::Outputs::File.new(config)
+            output.register
+            output.receive(good_event)
+            good_file = File.join(path, 'is/nested/output.txt')
+            expect(File.exist?(good_file)).to eq(true)
+            expect(File.stat(good_file).mode.to_s(8)[-3..-1]).to eq('610')
+            first_good_dir = File.join(path, 'is')
+            expect(File.stat(first_good_dir).mode.to_s(8)[-3..-1]).to eq('751')
+            second_good_dir = File.join(path, 'is/nested')
+            expect(File.stat(second_good_dir).mode.to_s(8)[-3..-1]).to eq('751')
+            output.close #teardown first to allow reading the file
+            File.open(good_file) {|f|
+              event = LogStash::Event.new(LogStash::Json.load(f.readline))
+              expect(event["message"]).to eq("hello world")
+            }
+          end
+        end
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-output-file
 version: !ruby/object:Gem::Version
-  version: 2.2.2
+  version: 2.2.3
 platform: ruby
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-12-22 00:00:00.000000000 Z
+date: 2016-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logstash-core