chef-handler-serf 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9d5b41042c4f3c6ede6b781564b67d2a410c4dfc
-  data.tar.gz: 988b3172a0250f218d8d24247c7e6c09ccd191cd
+  metadata.gz: 4bdcb572b6968268fdd7848893a7ee2cddfef682
+  data.tar.gz: 606b9c8bd900a3d9aeb10269d156397ed0edf3fe
 SHA512:
-  metadata.gz: beb7f255645031b5fe6282695900b2e836f94d0cf23a653c940f11162e1dcfcc3f76b8852e91e2e9e771bb4815d591fc0e039b7d245a2843461708c1bedf006b
-  data.tar.gz: 95277d4861962526efa6b291ce7b2cb6f4d75b767eee9ebdb7ef9220ae7f193a76d55b2ddde3ebbf27457cf6e30f6133973142e2d13f0a0b7be5cbb6c257bc48
+  metadata.gz: f0e0d76a9b197d6ec3ec27df1a20f831c7d03b9efede3c1a28233c15730f2d991019af2d63ecfc9de0ec326033eb3b617ff7e3f2aa9c45f18f4c3edf63fb8890
+  data.tar.gz: 4a7ac97dd4be2a1f1219afd0fbab84f8d5e29ad994d169cb725a14de29b1d7384001f188c049bbdd68c89bdbc990f16f50013e9b6806eac31cb8da26775353ca

data/README.md

@@ -40,6 +40,13 @@ run
 
 ```
 
+### Additional Options
+chef handler for serf can be configured to ignore failures when serf node
+is down (Errno::ECONNREFUSED).
+```ruby
+event_handlers << Chef::EventDispatch::Serf.new(ignore_failure: true)
+```
+
 Resource updated events can also be published as serf events using the
 `publish` meta attribute, introduced by  _chef-handler-serf_.
 

data/chef-handler-serf.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = 'chef-handler-serf'
-  spec.version       = '0.0.3'
+  spec.version       = '0.0.4'
   spec.authors       = ['Ranjib Dey']
   spec.email         = ['ranjib@pagerduty.com']
   spec.summary       = %q{Chef event handler for serf}

data/lib/chef/event_dispatch/serf.rb

@@ -23,32 +23,45 @@ class Chef
       def initialize(options = {})
         @subscribe = options.delete(:subscribe) || []
         @publish_all = options.delete(:publish_all) || false
-        @conn = Serfx.connect(options)
+        @ignore_failure = options.delete(:ignore_failure)
+        @conn_opts = options.dup
       end
 
       def run_start(version)
         payload = payload_to_json(version: version)
-        @conn.event(__method__.to_s, payload)
+        serf_event(__method__.to_s, payload)
       end
 
       def converge_complete
-        @conn.event(__method__.to_s, payload_to_json)
-        @conn.close unless @conn.closed?
+        serf_event(__method__.to_s, payload_to_json)
       end
 
       def resource_updated(res, action)
         if @publish_all or @subscribe.include?(res.to_s) or res.publish
           payload = payload_to_json(resource: res.to_s, action: action.to_s)
-          @conn.event(__method__.to_s, payload)
+          serf_event(__method__.to_s, payload)
         end
       end
 
-      private
       def payload_to_json(data = {})
         Chef::JSONCompat.to_json(
           data.merge(node: Chef::Config[:node_name])
         )
       end
+
+      def serf_event(*args)
+        begin
+          Serfx.connect(@conn_opts) do |conn|
+            conn.event(*args)
+          end
+        rescue Errno::ECONNREFUSED => e
+          if @ignore_failure
+            Chef::Log.warn("Failed to publish event in serf: #{e.message}")
+          else
+            raise e
+          end
+        end
+      end
     end
   end
 end

data/spec/serf_handler_spec.rb

@@ -3,19 +3,38 @@ require 'chef'
 require 'chef/event_dispatch/serf'
 
 describe 'serf handler' do
-
-  it 'should publish an event in serf' do
-    conn = double(Serfx::Connection)
-    allow(Serfx).to receive(:connect).and_return(conn)
-    handler = Chef::EventDispatch::Serf.new
+  before(:each) do
+    Chef::Config[:event_handlers].clear
+  end
+  let(:pass_payload) do
+    Chef::JSONCompat.to_json(
+      resource: 'execute[pass]',
+      action: 'run',
+      node: Chef::Config[:node_name]
+    )
+  end
+  let(:fail_payload) do
+    Chef::JSONCompat.to_json(
+      resource: 'execute[fail]',
+      action: 'run',
+      node: Chef::Config[:node_name]
+    )
+  end
+  let(:recipe) do
     Chef::Config[:solo] = true
-    Chef::Config[:event_handlers] << handler
     client = Chef::Client.new
     client.run_ohai
     client.load_node
     client.build_node
     rc = Chef::RunContext.new(client.node, {}, client.events)
-    recipe = Chef::Recipe.new('spec', 'serf', rc)
+    rec = Chef::Recipe.new('spec', 'serf', rc)
+    rec
+  end
+  it 'should publish an event in serf' do
+    conn = double(Serfx::Connection)
+    allow(Serfx).to receive(:connect).with({}).and_yield(conn)
+    handler = Chef::EventDispatch::Serf.new
+    Chef::Config[:event_handlers] << handler
     recipe.instance_eval do
       execute 'pass' do
         command 'echo HelloWorld'
@@ -25,24 +44,29 @@ describe 'serf handler' do
         command 'echo HelloWorld'
       end
     end
-
-    runner = Chef::Runner.new(rc)
-
-    pass_payload = Chef::JSONCompat.to_json(
-      resource: 'execute[pass]',
-      action: 'run',
-      node: Chef::Config[:node_name]
-    )
-
-    fail_payload = Chef::JSONCompat.to_json(
-      resource: 'execute[fail]',
-      action: 'run',
-      node: Chef::Config[:node_name]
-    )
-
+    runner = Chef::Runner.new(recipe.run_context)
     expect(conn).to receive(:event).with('resource_updated', pass_payload)
     expect(conn).to_not receive(:event).with('resource_updated', fail_payload)
     runner.converge
   end
+  it 'should not explode if serf is down and ignore_failure is set' do
+    conn = double(Serfx::Connection)
+    allow(Serfx).to receive(:connect).with({}).and_raise(Errno::ECONNREFUSED)
+    handler = Chef::EventDispatch::Serf.new(ignore_failure: true)
+    Chef::Config[:event_handlers] << handler
+    recipe.instance_eval do
+      execute 'pass' do
+        command 'echo HelloWorld'
+        publish true
+      end
+      execute 'fail' do
+        command 'echo HelloWorld'
+      end
+    end
+    runner = Chef::Runner.new(recipe.run_context)
+    expect do
+      runner.converge
+    end.to_not raise_error
+  end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef-handler-serf
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Ranjib Dey
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-11 00:00:00.000000000 Z
+date: 2014-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef