embulk-plugin-input-pcapng-files 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a831f929119e0209c353052fe5bf6e049dbafe36
-  data.tar.gz: 6c5d1a06ae6c8921c21a5577c03ad460eec672ea
+  metadata.gz: ab515e74e913cd88b9e420a88929afae017a0ff8
+  data.tar.gz: 5a0bfce47d4bee325a287c53320b3f610ceae806
 SHA512:
-  metadata.gz: c3a1b45cfd90162d1670a0f57ac2a78c10713feb26e9a44c09dffa72b6a2c1d615a253fda80ff4aaf082400daf6cea7a06d0e70d4d0ca69e85fd9aee7e868b85
-  data.tar.gz: fa8833f4b3d290e80ec1f9a1257890ce17edfb653e8ce60e1af956e4ca8798c382bc892b905643509f630bf4f542c3a342c5c9e59a15e8eb526534055b6e34d2
+  metadata.gz: 94c0c28cdf4b98c08449e71216d3a9d1f0fe561d557f7dc24c26d2e4fbbab0aed4964e8029574d1cb731d6520d5af7903b5326018d4b47256361378e02abb0be
+  data.tar.gz: 1da8e55c47aea4e2b60654d3b6ca3da67db66b02d790f8698fe2b9111cabbf5c14fdf8624b4161b8290f5cc9a10cffd99380f503047124d41861dce9dd8f0ea5

data/README.md

@@ -9,3 +9,12 @@ To extract specific field from pcapng files
 1. check sample\_config.yml, modify "paths" to where ever pcapng files are.
 2. specify fields to collect in "schema", name should correspond to tshark's field name
 
+
+## BUGs
+
+- "done" list is not properly handled
+
+### ToDo
+
+- Obviously, most part duplicates to file input.
+  - rewrite this as decoder or parser plugin?

data/lib/embulk/input_pcapng_files.rb

@@ -6,11 +6,9 @@ module Embulk
     Plugin.register_input('pcapng_files', self)
 
     def self.transaction(config, &control)
-      threads = config.param('threads', :integer, default: 2)
       task = {
         'paths' => [],
         'done' => config.param('done', :array, default: []),
-        'paths_per_thread' => [],
       }
 
       task['paths'] = config.param('paths', :array, default: []).map {|path|
@@ -20,9 +18,8 @@ module Embulk
         }
       }.flatten
       task['paths'] = task['paths'] - task['done']
-      task['paths_per_thread'] = task['paths'].each_slice(task['paths'].length / threads + 1).to_a
 
-      if task['paths'] == []
+      if task['paths'].empty?
         raise "no valid pcapng file found"
       end
 
@@ -35,10 +32,10 @@ module Embulk
         Column.new(idx, "#{c['name']}", c['type'].to_sym)
       }
 
-      commit_reports = yield(task, columns, threads)
+      commit_reports = yield(task, columns, task['paths'].length)
       done = commit_reports.map{|hash| hash["done"]}.flatten.compact
 
-      return config.merge({ "done" => done })
+      return {"done" => done}
     end
 
     def initialize(task, schema, index, page_builder)
@@ -50,22 +47,16 @@ module Embulk
     attr_reader :page_builder
 
     def run
-      paths = task['paths_per_thread'][@index]
-      if paths == nil or paths == []
-        return {} # no task, no fail
-      end
-
-      paths.each do |path|
-        each_packet(path, schema[1..-1].map{|elm| elm.name}) do |hash|
-          entry = [ path ] + schema[1..-1].map {|c|
-            convert(hash[c.name], c.type)
-          }
-          @page_builder.add(entry)
-        end
+      path = task['paths'][@index]
+      each_packet(path, schema[1..-1].map{|elm| elm.name}) do |hash|
+        entry = [ path ] + schema[1..-1].map {|c|
+          convert(hash[c.name], c.type)
+        }
+        @page_builder.add(entry)
       end
       @page_builder.finish # must call finish they say
 
-      return {"done" => paths}
+      return {"done" => path}
     end
 
     private

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: embulk-plugin-input-pcapng-files
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Naoya Kaneko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-28 00:00:00.000000000 Z
+date: 2015-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler