fluent-plugin-zookeeper 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6da100a74494bf6aee6e6f99dd565349cb0b3f94
-  data.tar.gz: 3226d0a38ea8d2d7c822064bfa144c3d9cbe530e
+  metadata.gz: 6ae092a2de92fad8b379a960104c0db3e407422a
+  data.tar.gz: 3a6b02377da167826d0f3a9663a39bf1d2141f9c
 SHA512:
-  metadata.gz: e3e5bd2c6ca6f7f55ae8ef7d43e1c5c6fab97eb28e77e3d3091827d7bda952437cafaf001ea9401d31eeae8faa5f0e99c563ebec7796d0f02d1e921d72348892
-  data.tar.gz: efc470264baeb4e87f3c3a446b008d48819f937ab16b6f46137e33ee58abe3bb5ac8ef62d6494a946f296612be4306a2a22ef4af2c8286e2b31ff0d5e2617e63
+  metadata.gz: d1d1208b37d537ce23ca660fbfdf2f1bff77733abab07b3cf92e391145b1533a9b3b51f75b74319843e59063ed164ce371f721d47c4308cfd4aafdad9403d24f
+  data.tar.gz: 2ce896b6aab4ec0979481df4e2e5fbcf62779e0b9a1affb11cd0cd53bc6b820131abd78c6d172ecd6d87eebcc57b84e4d8f813a649250473993714a13d0e190e

data/fluent-plugin-zookeeper.gemspec

@@ -3,7 +3,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name    = "fluent-plugin-zookeeper"
-  spec.version = "0.1.1"
+  spec.version = "0.1.2"
   spec.authors = ["Anton Tikhomirov"]
   spec.email   = ["anton.tikhomirov@cdnetworks.com"]
 

data/lib/fluent/plugin/out_zookeeper.rb

@@ -39,19 +39,29 @@ DESC
       end
 
       def init_client(raise_exception = true)
+        log.info "Initializing connection to Zookeeper"
         begin
-          @zk = Zookeeper.new(@servers)
+          if @zk.nil?
+            @zk = Zookeeper.new(@servers)
+          else
+            @zk.reopen
+          end
 
-          case @type
-          when 'ephemeral'
-            @zk.create({path: @path, ephemeral: true})
-          when 'sequence'
-            @zk.create({path: @path, sequence: true})
+          if @zk.connected?
+            case @type
+            when 'ephemeral'
+              @zk.create({path: @path, ephemeral: true})
+            when 'sequence'
+              @zk.create({path: @path, sequence: true})
+            else
+              # persistent (or anything else)
+              @zk.create({path: @path})
+            end
+            log.info "Connection to Zookeeper service [#@servers] has been initialized"
+            @con_lost_msg = "Connection to Zookeeper was lost"
           else
-            # persistent (or anything else)
-            @zk.create({path: @path})
+            log.warn "Cannot establish connection to Zookeeper"
           end
-          log.info "Connection to Zookeeper service [#@servers] has been initialized"
         rescue Exception => e
           if raise_exception
             raise e
@@ -91,27 +101,35 @@ DESC
       end
 
       def process(tag, es)
-        if !@zk.connected?
-          init_client(false)
-        end
-
-        begin
-          es.each do |time, record|
-            begin
-              data = @formatter_proc.call(record)
-            rescue StandardError => e
-              log.warn "Failed to format record:", :error => e.to_s, :record => record
-              next
-            end
-            if @ignore_empty_msg && data == "{}"
-              log.debug "Skipping empty record"
-              next
+        if @zk.connected?
+          begin
+            es.each do |time, record|
+              begin
+                data = @formatter_proc.call(record)
+              rescue StandardError => e
+                log.warn "Failed to format record:", :error => e.to_s, :record => record
+                next
+              end
+              if @ignore_empty_msg && data == "{}"
+                log.debug "Skipping empty record"
+                next
+              end
+              @zk.set({path: @path, data: data})
             end
-            @zk.set({path: @path, data: data})
+          rescue Exception => e
+            log.error "Exception occurred while sending data: #{e}"
+            # Connection will be reinitialized on next call
+            @zk.close
+          end
+        elsif !@zk.connecting?
+          # We are not connected and not connecting; it's time to reinit the client
+          @zk.close if !@zk.closed?
+          init_client(false)
+        else
+          if !@con_lost_msg.nil?
+            log.warn "#@con_lost_msg"
+            @con_lost_msg = nil
           end
-        rescue Exception => e
-          log.warn "Exception occurred while sending data: #{e}"
-          raise e
         end
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-zookeeper
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Anton Tikhomirov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-10 00:00:00.000000000 Z
+date: 2018-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -135,7 +135,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.5.2.1
 signing_key: 
 specification_version: 4
 summary: Fluentd plugin for Apache Zookeeper