fluent-plugin-norikra 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aa64957f7aa640bcb15c8bf4ac747e01617ecac0
-  data.tar.gz: cc7f497f0fda85c0dd5b45fb70d5470d631d4317
+  metadata.gz: 9c5a70a877e6907756117c024c6b0f612ca3d2e7
+  data.tar.gz: 7e0eeb416adb35f3a9814908b5d1fa78409b9433
 SHA512:
-  metadata.gz: 0e9ecc0d5c4eda53f6426e82991dcea65c9152f03b1a7846ad202428a315b1dcc91502460f4b405e6a57bd543457d177b6b24c87441846302e118f31e67fa422
-  data.tar.gz: c81c72fba462086810c65f45dd2d29fd6fbb042d78185052ab0fd92fbec2b706f0a7f217c4b6aacd7f8e85ce4b2a1be1d19353c903b9ccb2ded4417de9eff85f
+  metadata.gz: 71749b60e7162ed99424c5e28085d0d8ce511b5bd844a20dab791e76fd7169e46f48ab4bfe7661131d2d8681d9e2e43660a02c6e96191d3f597d0964b96ea6c1
+  data.tar.gz: 61db6abf7f640eb87b0493c489da02577637f3780e071272410401dc8cb6692a25a629b62f3dfd14f7e6e9a87c9060245f0d33f72342e2a3c7244af69a8897d1

data/README.md

@@ -19,8 +19,9 @@ At first, install JRuby and Norikra on your host if you are not using stand-alon
   * or other tools you want.
 2. swith to jruby, and install Norikra
   * `gem install norikra`
-3. check norikra path
-  * `which norikra`
+3. check and note `jruby` and `norikra-server`
+  * `which jruby`
+  * `which norikra-server`
 4. switch CRuby (with Fluentd), and install this plugin
   * `gem install fluent-plugin-norikra` (or use `fluent-gem`)
 5. configure Fluentd, and execute.
@@ -39,7 +40,9 @@ With built-in Norikra server, to receive tags like `event.foo` and send norikra'
       norikra localhost:26571 # this is default
       <server>
         execute yes
+		jruby   /home/user/.rbenv/versions/jruby-1.7.4/bin/jruby
         path    /home/user/.rbenv/versions/jruby-1.7.4/bin/norikra
+		opts    -Xmx2g
       </server>
       
       remove_tag_prefix event
@@ -68,7 +71,9 @@ If you know some field's types of records, you can define types of these fields.
       norikra localhost:26571 # this is default
       <server>
         execute yes
+		jruby   /home/user/.rbenv/versions/jruby-1.7.4/bin/jruby
         path    /home/user/.rbenv/versions/jruby-1.7.4/bin/norikra
+		opts    -Xmx2g
       </server>
       
       remove_tag_prefix event

data/fluent-plugin-norikra.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |spec|
   spec.name          = "fluent-plugin-norikra"
-  spec.version       = "0.0.1"
+  spec.version       = "0.0.2"
   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

@@ -72,7 +72,9 @@ module Fluent
           @config_targets[c.target] = c
         when 'server'
           @execute_server = Fluent::Config.bool_value(element['execute'])
+          @execute_jruby_path = element['jruby']
           @execute_server_path = element['path']
+          @execute_server_opts = element['opts']
         when 'event'
           event_section = element
         else
@@ -168,9 +170,13 @@ 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
       @norikra_pid = fork do
         ENV.keys.select{|k| k =~ /^(RUBY|GEM|BUNDLE|RBENV|RVM|rvm)/}.each {|k| ENV.delete(k)}
-        exec [@execute_server_path, 'norikra(fluentd)'], 'start', '-H', @host, '-P', @port.to_s
+        exec([@execute_jruby_path, '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.1
+  version: 0.0.2
 platform: ruby
 authors:
 - TAGOMORI Satoshi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-29 00:00:00.000000000 Z
+date: 2013-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: norikra-client