fluent-plugin-dockerevents 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 509d1174b298bb783dfb80f0aeecde1a9a2c34c5
-  data.tar.gz: 19d2b3f54371188329b59b605ffe9783ddebfbe2
+  metadata.gz: 71357c18e83c8e7a1d3b111225323ffd659a369d
+  data.tar.gz: e2488f5bc7737b2f305aa770d30a3420602877ff
 SHA512:
-  metadata.gz: ffdddecd32b02d92a2712befb4d63ede082dc712661dfcc79cdc28c06c26fe54d63efd13cd0fbbc00b439f0d75631d52384aefdba31a0480fcba62760673f5af
-  data.tar.gz: ebb408231a5a20bfa6d3117e32823c407198e1d3ead469910c78800f1ecc4220ed0165db50a33aadd5c9e3ea4b9da24bcc0aa62b649dfe7a40c440b1cf1e1b76
+  metadata.gz: 6d1f303899c02e1ca688bc690968eab9dcbbba8c0d5e7113c51f81fd0da2587d940e0ed3472e7e5f7422702d9a4864bc26c7d78b5e0db74c9f03a24bd9b52885
+  data.tar.gz: 3499a62d87c6e74e3d7722c0c7cdc5db678466fe735cdf0bcfbebc6c1ade99043af3652807fbb9db2e752b910e8ab64e4bc3d6492e86f1da88a22ac524b6fa9e

data/RELEASE.md

@@ -0,0 +1,5 @@
+
+Release notes
+
+# v.0.0.3
+ * Bugfix: Fix hanginx docker API call with having the request in separate threads

data/fluent-plugin-dockerevents.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name          = "fluent-plugin-dockerevents"
-  s.version       = '0.0.2'
+  s.version       = '0.0.3'
   s.authors       = ["Karoly Nagy"]
   s.email         = ["dr.karoly.nagy@gmail.com"]
   s.description   = %q{Docker Event Stream inpupt plugin for Fluentd}

data/lib/fluent/plugin/in_docker_event_streams.rb

@@ -0,0 +1,66 @@
+module Fluent
+    class DockerEventStreamInput < Input 
+        Fluent::Plugin.register_input('docker_events', self)
+
+        config_param :tag, :string, :default => "docker"
+        config_param :events, :string, :default => []
+
+        # Define `router` method of v0.12 to support v0.10 or earlier
+        unless method_defined?(:router)
+          define_method("router") { Fluent::Engine }
+        end
+
+        def initialize
+          super
+          require 'docker'
+        end
+
+        def configure(conf)
+          super
+          @events = @events.split(',').map {|event| event.strip }
+        end
+
+        def start
+          super
+
+          @running = true
+          @thread = Thread.new(&method(:run))
+        end
+
+        def shutdown
+          @running = false
+          @thread.join
+        end
+
+        def run     
+            while @running
+                Docker::Event.stream do |event|
+                    if @events.include?(event.action)
+                        emit(event)
+                    end
+                end
+            end
+        end
+
+        def emit(r)
+            record = {
+                "id" => r.id,
+                "action" => r.action,
+                "status" => r.status,
+                "type" => r.type,
+            }
+            _container = Docker::Container.get(r.id)
+            if _container
+                record["container"] = {
+                    "state" => _container.info["State"],
+                    "name" => _container.info["Name"].gsub(/^\//, ''),
+                }
+                _image = Docker::Image.get(_container.info["Image"])
+                if _image
+                    record["container"]["image"] = _image.info["RepoTags"]
+                end
+            end
+            router.emit(@tag, Time.now.to_i, record)
+        end
+    end
+end

data/lib/fluent/plugin/in_docker_events.rb

@@ -49,13 +49,13 @@ module Fluent
                 "status" => r.status,
                 "type" => r.type,
             }
-            _container = Docker::Container.get(r.id)
+            _container = Thread.new{ results = Docker::Container.get(r.id) }.value
             if _container
                 record["container"] = {
                     "state" => _container.info["State"],
                     "name" => _container.info["Name"].gsub(/^\//, ''),
                 }
-                _image = Docker::Image.get(_container.info["Image"])
+                _image = Thread.new{ results = Docker::Image.get(_container.info["Image"]) }.value
                 if _image
                     record["container"]["image"] = _image.info["RepoTags"]
                 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-dockerevents
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Karoly Nagy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-01 00:00:00.000000000 Z
+date: 2016-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -103,8 +103,10 @@ files:
 - Gemfile
 - LICENSE
 - README.md
+- RELEASE.md
 - example/in.docker.events.conf
 - fluent-plugin-dockerevents.gemspec
+- lib/fluent/plugin/in_docker_event_streams.rb
 - lib/fluent/plugin/in_docker_events.rb
 homepage: https://github.com/charlesnagy/fluent-plugin-docker-events
 licenses: