fluent-plugin-wendelin 0.1 → 0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6e6c384d1f285c3556d5386d79ef196abdee347f
-  data.tar.gz: e59ea08e8bf2b24d501ac66df7164b8daddc0795
+  metadata.gz: e50ee5d5b3aa16a13dbb53978a7b32ea1c6f57f9
+  data.tar.gz: 1785d3a126e15bf2e0c2955cdbf1a45009c0f927
 SHA512:
-  metadata.gz: 0be6d7dac13b092bbcfad5c41f7719b3137313621a7ba15bf0677573fee89ae398af544774e595a2bbaff7f894bd8030fef4c27389a881f3668a88cec81a9095
-  data.tar.gz: 0ef2c3b94b5e98c9a7e5ba5a2a4e726b19fa2bf710a6d1034ea4d2b19997041b94d61e6f6b5af4c34c930e8dbccd9cf0c3ad7f25d8dea4ba4de7f4c921e6e53e
+  metadata.gz: 0b343fb750f715be40e1ff73524a9d390f058695aae267f3aa5ea6ee8c8e1beae5b31c2b8e9df4df3965047e53c6043e28df127fef74500f532084fe5fb1e968
+  data.tar.gz: d191203f96139e5f3b63825be64baac295d822e026281589f3c7db843d0e736a0e2a32c1fc342a6e2c0dfb6960d6412b1d7a18b3ca0ca1d763ae388df51f9304

data/fluent-plugin-wendelin.gemspec

@@ -1,12 +1,12 @@
 Gem::Specification.new do |gem|
     gem.name            = "fluent-plugin-wendelin"
-    gem.version         = "0.1"
+    gem.version         = "0.2"
     gem.authors         = ["Kirill Smelkov"]
     gem.email           = ["kirr@nexedi.com"]
     gem.summary         = %q{Fluentd output to Wendelin}
     gem.description     = %q{Fluentd output plugin to forward data to Wendelin system}
     gem.homepage        = "https://lab.nexedi.com/nexedi/fluent-plugin-wendelin"
-    gem.license         = "APLv2"
+    gem.license         = "Apache-2.0"
 
     gem.files           = `git ls-files -z`.split("\x0")
     gem.require_paths   = ["lib"]

data/lib/fluent/plugin/out_wendelin.rb

@@ -47,7 +47,7 @@ module Fluent
             credentials['user']     = @user
             credentials['password'] = @password
         end
-        @wendelin = WendelinClient.new(@streamtool_uri, credentials)
+        @wendelin = WendelinClient.new(@streamtool_uri, credentials, @log)
     end
 
     def start

data/lib/fluent/plugin/wendelin_client.rb

@@ -19,18 +19,17 @@
 require 'net/http'
 require 'openssl'
 
-# show request/response traces or not
-$trace    = false
-
 
 # class representing a Wendelin client
 class WendelinClient
 
   # `streamtool_uri` - URI pointing to portal_input_data_stream "mountpoint"
   # `credentials`    # {'user' => _, 'password' => _}     TODO change to certificate
-  def initialize(streamtool_uri, credentials)
+  # `log` - logger to use
+  def initialize(streamtool_uri, credentials, log)
     @streamtool_uri = streamtool_uri
     @credentials    = credentials
+    @log            = log
   end
 
 
@@ -48,15 +47,15 @@ class WendelinClient
       # req.content_type = 'application/octet-stream'
       req.set_form_data('data_chunk' => data_chunk)
 
-      if $trace
-          puts '>>> REQUEST'
-          puts "method\t=> #{req.method}"
-          puts "path\t=> #{req.path}"
-          puts "uri\t=> #{req.uri}"
-          puts "body\t=> #{req.body}"
-          puts "body_stream\t=> #{req.body_stream}"
-          req.each {|h| puts "#{h}:\t#{req[h]}"}
-          puts
+      @log.on_trace do
+          @log.trace '>>> REQUEST'
+          @log.trace "method\t=> #{req.method}"
+          @log.trace "path\t=> #{req.path}"
+          @log.trace "uri\t=> #{req.uri}"
+          @log.trace "body\t=> #{req.body}"
+          @log.trace "body_stream\t=> #{req.body_stream}"
+          req.each {|h| @log.trace "#{h}:\t#{req[h]}"}
+          @log.trace
       end
 
       begin
@@ -66,30 +65,38 @@ class WendelinClient
                       :use_ssl      => (uri.scheme == 'https'),
                       # NOTE = "do not check server cert"
                       # TODO move this out to conf parameters
-                      :verify_mode  => OpenSSL::SSL::VERIFY_NONE
+                      :verify_mode  => OpenSSL::SSL::VERIFY_NONE,
+
+                      # Net::HTTP default open timeout is infinity, which results
+                      # in thread hang forever if other side does not fully
+                      # establish connection. Default read_timeout is 60 seconds.
+                      # We go safe way and make sure all timeouts are defined.
+                      :ssl_timeout  => 60,
+                      :open_timeout => 60,
+                      :read_timeout => 60,
                 ) do |http|
               http.request(req)
           end
 
       rescue
           # some http/ssl/other connection error
-          puts "HTTP ERROR:"
+          @log.warn "HTTP ERROR:"
           raise
 
       else
-          if $trace
-              puts '>>> RESPONSE'
-              res.each {|h| puts "#{h}:\t#{res[h]}"}
-              puts "code\t=> #{res.code}"
-              puts "msg\t=> #{res.message}"
-              puts "class\t=> #{res.class}"
-              puts "body:", res.body
+          @log.on_trace do
+              @log.trace '>>> RESPONSE'
+              res.each {|h| @log.trace "#{h}:\t#{res[h]}"}
+              @log.trace "code\t=> #{res.code}"
+              @log.trace "msg\t=> #{res.message}"
+              @log.trace "class\t=> #{res.class}"
+              @log.trace "body:", res.body
           end
 
           if res.kind_of?(Net::HTTPSuccess)       # res.code is 2XX
-              #puts "ingested ok"
+              #@log.info "ingested ok"
           else
-              puts "FAIL:"
+              @log.warn "FAIL:"
               res.value
           end
       end

data/test/wendelin_test.rb

@@ -5,6 +5,10 @@
 here = File.dirname(__FILE__)
 $LOAD_PATH << File.expand_path(File.join(here, '../lib'))
 require 'fluent/plugin/wendelin_client'
+require 'fluent/log'
+require 'fluent/engine' # for log
+
+log       = Fluent::Log.new(out=STDERR, level=Fluent::Log::LEVEL_TRACE)
 
 # FIXME hardcoded
 $user     = 'user'
@@ -14,7 +18,7 @@ $password = 'password'
 $erp5       = "https://example.com/erp5"                # erp5 root
 $streamtool = "#{$erp5}/portal_input_data_streams"      # where Input Stream Tool is mounted
 
-$wendelin   = WendelinClient.new($streamtool, {'user' => $user, 'password' => $password})
+$wendelin   = WendelinClient.new($streamtool, {'user' => $user, 'password' => $password}, log)
 
 
 def ingest(input_stream_ref, data_chunk)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-wendelin
 version: !ruby/object:Gem::Version
-  version: '0.1'
+  version: '0.2'
 platform: ruby
 authors:
 - Kirill Smelkov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-25 00:00:00.000000000 Z
+date: 2016-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -44,7 +44,7 @@ files:
 - test/wendelin_test.rb
 homepage: https://lab.nexedi.com/nexedi/fluent-plugin-wendelin
 licenses:
-- APLv2
+- Apache-2.0
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -62,7 +62,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Fluentd output to Wendelin