logstash-output-csv 3.0.2 → 3.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 74dd7ef63fed3df056bcdd082e599f0dbcaa6723
-  data.tar.gz: 91a0932faf62b491baec76a5e3d3444ee1bb0ef8
+  metadata.gz: cf27eb2bd2a2c7f319206b2551e773db1b1384fa
+  data.tar.gz: b39854c4fb69d80283c5948dd51b8e024403995c
 SHA512:
-  metadata.gz: 59dbf98e009b4e68cd76362e4f7cd2744aae985ab564c9ac8ad9f62c9209b38c24620c562042468fe1d447699812c0b87606c2028115706e04f77ac5eae83c85
-  data.tar.gz: dd55a2561c0e7e8a7b1fe977dee7cbe89b9019a46dbefd88058b4e261eb48ae15202587051fa64343dfbda970e94c971f7fed3df4362eee22b21d2087acb843e
+  metadata.gz: abfe83405456fb2f8104ba51c3728c3548db5707971009d4490f5c6276158c934d995350723e3a63465e7379ac421db2106fce3906a37d0cb8c6de282e0e0909
+  data.tar.gz: 7e8a4ff31b01e17edfe7dfcbfef730898e293fd8cc2bae3c2d9a1ec2c5002dd0037bdd59f74b63fb769cc0f9a41986b19c6ba9ca5ec5573a8003e9f6ffe3fd51

data/CHANGELOG.md

@@ -1,16 +1,24 @@
+## 3.0.3
+  - Use new Logsash 2.4/5.0 APIs for working batchwise and with shared concurrency (fix for https://github.com/logstash-plugins/logstash-output-csv/issues/10)
+  - this update aligns with its subclass logstash-output-file version 4.0.0, https://github.com/logstash-plugins/logstash-output-file
+
 ## 3.0.2
   - Relax constraint on logstash-core-plugin-api to >= 1.60 <= 2.99
 
 ## 3.0.1
   - Republish all the gems under jruby.
+
 ## 3.0.0
   - Update the plugin to the version 2.0 of the plugin api, this change is required for Logstash 5.0 compatibility. See https://github.com/elastic/logstash/issues/5141
-# 2.0.5
+
+## 2.0.5
   - Depend on logstash-core-plugin-api instead of logstash-core, removing the need to mass update plugins on major releases of logstash
-# 2.0.4
+
+## 2.0.4
   - New dependency requirements for logstash-core for the 5.0 release
+
 ## 2.0.3
- - Escape rogue values by default, which can be interpreted by spreadsheet apps. Add option to turn it off 
+ - Escape rogue values by default, which can be interpreted by spreadsheet apps. Add option to turn it off
 
 ## 2.0.0
  - Plugins were updated to follow the new shutdown semantic, this mainly allows Logstash to instruct input plugins to terminate gracefully,

data/lib/logstash/outputs/csv.rb

@@ -33,18 +33,32 @@ class LogStash::Outputs::CSV < LogStash::Outputs::File
   end
 
   public
-  def receive(event)
+  def multi_receive_encoded(events_and_encoded)
+    encoded_by_path = Hash.new {|h,k| h[k] = []}
 
-    path = event.sprintf(@path)
-    fd = open(path)
-    csv_values = @fields.map {|name| get_value(name, event)}
-    fd.write(csv_values.to_csv(@csv_options))
+    events_and_encoded.each do |event,encoded|
+      file_output_path = event_path(event)
+      encoded_by_path[file_output_path] << event_to_csv(event)
+    end
+
+    @io_mutex.synchronize do
+      encoded_by_path.each do |path,chunks|
+        fd = open(path)
+        chunks.each {|chunk| fd.write(chunk) }
+        fd.flush
+      end
 
-    flush(fd)
-    close_stale_files
-  end #def receive
+      close_stale_files
+    end
+  end
 
   private
+
+  def event_to_csv(event)
+    csv_values = @fields.map {|name| get_value(name, event)}
+    csv_values.to_csv(@csv_options)
+  end
+
   def get_value(name, event)
     val = event.get(name)
     val.is_a?(Hash) ? LogStash::Json.dump(val) : escape_csv(val)

data/logstash-output-csv.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
 
   s.name            = 'logstash-output-csv'
-  s.version         = '3.0.2'
+  s.version         = '3.0.3'
   s.licenses        = ['Apache License (2.0)']
   s.summary         = "Write events to disk in CSV or other delimited format"
   s.description     = "This gem is a Logstash plugin required to be installed on top of the Logstash core pipeline using $LS_HOME/bin/logstash-plugin install gemname. This gem is not a stand-alone program"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-output-csv
 version: !ruby/object:Gem::Version
-  version: 3.0.2
+  version: 3.0.3
 platform: ruby
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-07-14 00:00:00.000000000 Z
+date: 2017-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -123,7 +123,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.6.3
+rubygems_version: 2.4.8
 signing_key:
 specification_version: 4
 summary: Write events to disk in CSV or other delimited format