logstash-output-file 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e6b33f425aa5293480bcc2c4af3ee67be1939fd1
-  data.tar.gz: 10169d9ac5138247aaa73aa83b7a89334e247e8f
+  metadata.gz: 6830f6d31289b7dde214ce06f996e209ee3db5e4
+  data.tar.gz: a2bc877e8c05e09d8fdb31a32b395a2297a07a61
 SHA512:
-  metadata.gz: fa3b83b84a216b1867219d26a4c3d7145a72f79ca714e984cf45446579641649714b08e3a9dc703b7178fdc3575360ff0825a2bbb4f3f964758ee3b8e42838d2
-  data.tar.gz: 7f6f55bf836b152b233fe3bced59566eebb6584b5c504697c51835099cb045a7d52dfce4e3685e546fe4abc9b333e81b1e619c15a6297ed1e572f148e9c717e3
+  metadata.gz: 798c79e80e9b82b9abe8181b7525bd53ff38e61a41e13739b2469041a8ba6ba0a3a782de8e35375919a665d23681d4495e126d578b3f7693d992cbb050281e92
+  data.tar.gz: 7cea0a4017d05aadac33325a9250a25bb2964b9bedd32365cf1764957293c6cadc67b012cf2110ebec21cd6bb787fafca0d83af4dd67f2f7eea2d92494ff2076

data/lib/logstash/outputs/file.rb

@@ -76,14 +76,23 @@ class LogStash::Outputs::File < LogStash::Outputs::Base
 
   private
   def validate_path
-    root_directory = @path.split(File::SEPARATOR).select { |item| !item.empty? }.shift
-
     if (root_directory =~ FIELD_REF) != nil
       @logger.error("File: The starting part of the path should not be dynamic.", :path => @path)
       raise LogStash::ConfigurationError.new("The starting part of the path should not be dynamic.")
     end
   end
 
+  private
+  def root_directory
+    parts = @path.split(File::SEPARATOR).select { |item| !item.empty?  }
+    if Gem.win_platform?
+      # First part is the drive letter
+      parts[1]
+    else
+      parts.first
+    end
+  end
+
   public
   def receive(event)
     return unless output?(event)
@@ -99,6 +108,20 @@ class LogStash::Outputs::File < LogStash::Outputs::Base
     write_event(file_output_path, output)
   end # def receive
 
+  public
+  def teardown
+    @logger.debug("Teardown: closing files")
+    @files.each do |path, fd|
+      begin
+        fd.close
+        @logger.debug("Closed file #{path}", :fd => fd)
+      rescue Exception => e
+        @logger.error("Exception while flushing and closing files.", :exception => e)
+      end
+    end
+    finished
+  end
+
   private
   def inside_file_root?(log_path)
     target_file = File.expand_path(log_path)
@@ -129,6 +152,7 @@ class LogStash::Outputs::File < LogStash::Outputs::Base
     path =~ FIELD_REF
   end
 
+  private
   def format_message(event)
     if @message_format
       event.sprintf(@message_format)
@@ -137,24 +161,12 @@ class LogStash::Outputs::File < LogStash::Outputs::Base
     end
   end
 
+  private
   def extract_file_root
     parts = File.expand_path(path).split(File::SEPARATOR)
     parts.take_while { |part| part !~ FIELD_REF }.join(File::SEPARATOR)
   end
 
-  def teardown
-    @logger.debug("Teardown: closing files")
-    @files.each do |path, fd|
-      begin
-        fd.close
-        @logger.debug("Closed file #{path}", :fd => fd)
-      rescue Exception => e
-        @logger.error("Exception while flushing and closing files.", :exception => e)
-      end
-    end
-    finished
-  end
-
   private
   def flush(fd)
     if flush_interval > 0
@@ -165,6 +177,7 @@ class LogStash::Outputs::File < LogStash::Outputs::Base
   end
 
   # every flush_interval seconds or so (triggered by events, but if there are no events there's no point flushing files anyway)
+  private
   def flush_pending_files
     return unless Time.now - @last_flush_cycle >= flush_interval
     @logger.debug("Starting flush cycle")
@@ -176,6 +189,7 @@ class LogStash::Outputs::File < LogStash::Outputs::Base
   end
 
   # every 10 seconds or so (triggered by events, but if there are no events there's no point closing files anyway)
+  private
   def close_stale_files
     now = Time.now
     return unless now - @last_stale_cleanup_cycle >= @stale_cleanup_interval
@@ -192,6 +206,7 @@ class LogStash::Outputs::File < LogStash::Outputs::Base
     @last_stale_cleanup_cycle = now
   end
 
+  private
   def open(path)
     return @files[path] if @files.include?(path) and not @files[path].nil?
 

data/logstash-output-file.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
 
   s.name            = 'logstash-output-file'
-  s.version         = '0.1.3'
+  s.version         = '0.1.4'
   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

@@ -77,28 +77,25 @@ describe LogStash::Outputs::File do
   end
 
   describe "#register" do
+    let(:path) { '/%{name}' }
+    let(:output) { LogStash::Outputs::File.new({ "path" => path }) }
+
     it 'doesnt allow the path to start with a dynamic string' do
-      path = '/%{name}'
-      output = LogStash::Outputs::File.new({ "path" => path })
       expect { output.register }.to raise_error(LogStash::ConfigurationError)
+      output.teardown
     end
 
-    it 'doesnt allow the root directory to have some dynamic part' do
-      path = '/a%{name}/'
-      output = LogStash::Outputs::File.new({ "path" => path })
-      expect { output.register }.to raise_error(LogStash::ConfigurationError)
-
-      path = '/a %{name}/'
-      output = LogStash::Outputs::File.new({ "path" => path })
-      expect { output.register }.to raise_error(LogStash::ConfigurationError)
-
-      path = '/a- %{name}/'
-      output = LogStash::Outputs::File.new({ "path" => path })
-      expect { output.register }.to raise_error(LogStash::ConfigurationError)
-
-      path = '/a- %{name}'
-      output = LogStash::Outputs::File.new({ "path" => path })
-      expect { output.register }.to raise_error(LogStash::ConfigurationError)
+    context 'doesnt allow the root directory to have some dynamic part' do
+      ['/a%{name}/',
+       '/a %{name}/',
+       '/a- %{name}/',
+       '/a- %{name}'].each do |test_path|
+         it "with path: #{test_path}" do
+           path = test_path
+           expect { output.register }.to raise_error(LogStash::ConfigurationError)
+           output.teardown
+         end
+       end
     end
 
     it 'allow to have dynamic part after the file root' do
@@ -136,6 +133,7 @@ describe LogStash::Outputs::File do
             error_file = File.join(path, config["filename_failure"])
 
             expect(File.exist?(error_file)).to eq(true)
+            output.teardown
           end
         end
 
@@ -154,6 +152,7 @@ describe LogStash::Outputs::File do
             output.receive(bad_event)
 
             expect(Dir.glob(File.join(path, "*")).size).to eq(2)
+            output.teardown
           end
         end
 
@@ -166,6 +165,7 @@ describe LogStash::Outputs::File do
             output.receive(bad_event)
 
             expect(Dir.glob(File.join(path, "*")).size).to eq(1)
+            output.teardown
           end
         end
       end
@@ -183,6 +183,7 @@ describe LogStash::Outputs::File do
 
             good_file = File.join(path, good_event['error'])
             expect(File.exist?(good_file)).to eq(true)
+            output.teardown
           end
         end
 
@@ -200,6 +201,7 @@ describe LogStash::Outputs::File do
             output.receive(good_event)
 
             expect(File.exist?(expected_path)).to eq(true)
+            output.teardown
           end
         end
 
@@ -221,6 +223,7 @@ describe LogStash::Outputs::File do
             output.receive(good_event)
 
             expect(File.exist?(expected_path)).to eq(true)
+            output.teardown
           end
         end
 
@@ -236,6 +239,7 @@ describe LogStash::Outputs::File do
 
             good_file = File.join(path, good_event['error'])
             expect(File.exist?(good_file)).to eq(true)
+            output.teardown
           end
         end
       end

metadata

@@ -1,17 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: logstash-output-file
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Elasticsearch
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-01-27 00:00:00.000000000 Z
+date: 2015-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  requirement: !ruby/object:Gem::Requirement
+  name: logstash
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
@@ -19,10 +20,7 @@ dependencies:
     - - <
       - !ruby/object:Gem::Version
         version: 2.0.0
-  name: logstash
-  prerelease: false
-  type: :runtime
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
@@ -30,34 +28,36 @@ dependencies:
     - - <
       - !ruby/object:Gem::Version
         version: 2.0.0
+  prerelease: false
+  type: :runtime
 - !ruby/object:Gem::Dependency
+  name: logstash-input-generator
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  name: logstash-input-generator
   prerelease: false
   type: :runtime
+- !ruby/object:Gem::Dependency
+  name: logstash-devutils
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  name: logstash-devutils
   prerelease: false
   type: :development
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 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
 email: info@elasticsearch.com
 executables: []