fluent-plugin-norikra 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9c5a70a877e6907756117c024c6b0f612ca3d2e7
-  data.tar.gz: 7e0eeb416adb35f3a9814908b5d1fa78409b9433
+  metadata.gz: 438de874a5cf49d1dfeb86c755b5bb7d69ab9715
+  data.tar.gz: 9aff77e6751e8e4757954ce2ae262f263abc136d
 SHA512:
-  metadata.gz: 71749b60e7162ed99424c5e28085d0d8ce511b5bd844a20dab791e76fd7169e46f48ab4bfe7661131d2d8681d9e2e43660a02c6e96191d3f597d0964b96ea6c1
-  data.tar.gz: 61db6abf7f640eb87b0493c489da02577637f3780e071272410401dc8cb6692a25a629b62f3dfd14f7e6e9a87c9060245f0d33f72342e2a3c7244af69a8897d1
+  metadata.gz: 1b19b1cd4f3e2a1b49ff8e6723e5aea17b7e3cd64bd3e96225d0ad55c935cfd34870ff0ca6f7df646ac87fb982dccacd19beb2eea38f823da4cb1a280dfb2dd6
+  data.tar.gz: 9774924e5b9aa84e692776ec249e3cac2363a8a21b5541b1cb9cdd88d7994a0a4e9987a1d1920618f796942ac5139bb4b507286c9c75e8421afc7fbdd6d69f46

data/fluent-plugin-norikra.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |spec|
   spec.name          = "fluent-plugin-norikra"
-  spec.version       = "0.0.2"
+  spec.version       = "0.0.3"
   spec.authors       = ["TAGOMORI Satoshi"]
   spec.email         = ["tagomoris@gmail.com"]
   spec.description   = %q{process events on fluentd with SQL like query, with built-in Norikra server if needed.}

data/lib/fluent/plugin/out_norikra.rb

@@ -71,7 +71,7 @@ module Fluent
           c = ConfigSection.new(element)
           @config_targets[c.target] = c
         when 'server'
-          @execute_server = Fluent::Config.bool_value(element['execute'])
+          @execute_server = true
           @execute_jruby_path = element['jruby']
           @execute_server_path = element['path']
           @execute_server_opts = element['opts']
@@ -170,13 +170,19 @@ module Fluent
 
     def server_starter
       $log.info "starting Norikra server process #{@host}:#{@port}"
-      options = [@execute_server_path, 'start', '-H', @host, '-P', @port.to_s]
-      if @execute_server_opts
-        options.unshift(*@execute_server_opts.split(/ +/).map{|opt| '-J' + opt})
-      end
+      base_options = [@execute_server_path, 'start', '-H', @host, '-P', @port.to_s]
+      cmd,options = if @execute_jruby_path
+                      args = [@execute_server_path, 'start', '-H', @host, '-P', @port.to_s]
+                      if @execute_server_opts
+                        args.unshift(*@execute_server_opts.split(/ +/).map{|opt| '-J' + opt})
+                      end
+                      [@execute_jruby_path, args]
+                    else
+                      [@execute_server_path, ['start', '-H', @host, '-P', @port.to_s]]
+                    end
       @norikra_pid = fork do
         ENV.keys.select{|k| k =~ /^(RUBY|GEM|BUNDLE|RBENV|RVM|rvm)/}.each {|k| ENV.delete(k)}
-        exec([@execute_jruby_path, 'norikra(fluentd)'], *options)
+        exec([cmd, 'norikra(fluentd)'], *options)
       end
       connecting = true
       $log.info "trying to confirm norikra server status..."

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-norikra
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - TAGOMORI Satoshi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-30 00:00:00.000000000 Z
+date: 2013-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: norikra-client
@@ -111,7 +111,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.0
+rubygems_version: 2.0.2
 signing_key: 
 specification_version: 4
 summary: Fluentd plugin to do CEP with norikra