cycle_chef_handler 1.2.1 → 1.2.2

data/lib/cycle_chef_handler.rb

@@ -3,6 +3,7 @@
 # Report handler for chef clients to be used with CycleServer Chef Dashboard
 #
 # Author: Chris Chalfant (chris.chalfant@cyclecomputing.com)
+# Author: Dan Harris (dharris@cyclecomputing.com)
 #
 # Copyright 2010 Cycle Computing LLC
 #
@@ -26,7 +27,7 @@ require 'fileutils'
 require 'uri'
 
 class CycleChefHandler < Chef::Handler
-  VERSION = '1.2.1'
+  VERSION = '1.2.2'
 
   def initialize(params)
     defaults = {:exchange    => 'chef',
@@ -37,7 +38,9 @@ class CycleChefHandler < Chef::Handler
                 :queue => nil,
                 :queue_durable => false,
                 :queue_autodelete => true,
-                :routing_key => 'chef'}
+                :routing_key => 'chef',
+                :max_retries => 5,
+                :retry_delay => 5}
 
     @amqp_config = defaults.merge(params[:amqp_config])
     check_amqp_config
@@ -55,67 +58,74 @@ class CycleChefHandler < Chef::Handler
     end
   end
 
+
   def report
 
     ## Create and Post a classad
     ad = create_ad
     payload = "<classads>" + ad.to_xml + "</classads>"
     
-    begin
+    for attempt in 1..@amqp_config[:max_retries] do
+      begin
 
-      b = Bunny.new(@amqp_config)
+        b = Bunny.new(@amqp_config)
 
-      b.start
-      e = b.exchange(@amqp_config[:exchange], 
-                     :type        => @amqp_config[:exchange_type],
-                     :durable     => @amqp_config[:exchange_durable], 
-                     :auto_delete => @amqp_config[:exchange_autodelete])
+        b.start
+        e = b.exchange(@amqp_config[:exchange], 
+                      :type        => @amqp_config[:exchange_type],
+                      :durable     => @amqp_config[:exchange_durable], 
+                      :auto_delete => @amqp_config[:exchange_autodelete])
 
-      # in some cases, the user may want to declare and bind a queue
-      # to the exchange so consumers get all messages, even ones that 
-      # enter the exchange before the consumer exists.
-      if @amqp_config[:bind_queue]
-        q = b.queue(@amqp_config[:queue], 
-                   :durable     => @amqp_config[:queue_durable],
-                   :auto_delete => @amqp_config[:queue_autodelete])
+        # in some cases, the user may want to declare and bind a queue
+        # to the exchange so consumers get all messages, even ones that 
+        # enter the exchange before the consumer exists.
+        if @amqp_config[:bind_queue]
+          q = b.queue(@amqp_config[:queue], 
+                     :durable     => @amqp_config[:queue_durable],
+                     :auto_delete => @amqp_config[:queue_autodelete])
 
-        if not @amqp_config[:routing_key].nil?
+          if not @amqp_config[:routing_key].nil?
 
-          q.bind(@amqp_config[:exchange], :key => @amqp_config[:routing_key])
+            q.bind(@amqp_config[:exchange], :key => @amqp_config[:routing_key])
 
-        else
+          else
 
-          q.bind(@amqp_config[:exchange])
+            q.bind(@amqp_config[:exchange])
 
-        end
+          end
 
-      end
+        end
 
-      if not @amqp_config[:routing_key].nil?
+        if not @amqp_config[:routing_key].nil?
 
-        e.publish(payload, :key => @amqp_config[:routing_key])
+          e.publish(payload, :key => @amqp_config[:routing_key])
 
-      else
+        else
+          
+          e.publish(payload)
         
-        e.publish(payload)
-      
-      end
+        end
 
-    rescue Exception => e
+        Chef::Log.info("Posted converge history report")
+        return
 
-      # log any exceptions, but don't throw one.
-      trace = e.backtrace.join("\n")
-      Chef::Log.error("Failed to post converge history report: #{e.message} #{trace}")
-      return
+      rescue Exception => e
+        if attempt < @amqp_config[:max_retries]
+          delay = attempt * @amqp_config[:retry_delay]
+          Chef::Log.error("Failed to post converge history report, retrying in #{delay} seconds...")
+          sleep(delay)  # Sleep for a while if it's a transient communcation error then try again
+        else
+          trace = e.backtrace.join("\n")
+          Chef::Log.error("Failed to post converge history report: #{e.message} #{trace}")
+          return
+        end
 
-    ensure
+      ensure
 
-      b.stop
+        b.stop
 
+      end
     end
-
-    Chef::Log.info("Posted converge history report")
-
   end
 
   def create_ad

metadata

@@ -1,95 +1,112 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: cycle_chef_handler
-version: !ruby/object:Gem::Version 
-  hash: 29
+version: !ruby/object:Gem::Version
+  version: 1.2.2
   prerelease: 
-  segments: 
-  - 1
-  - 2
-  - 1
-  version: 1.2.1
 platform: ruby
-authors: 
+authors:
 - Chris Chalfant
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-09-15 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-01-30 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: chef
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: bunny
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: bunny
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: classad
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: classad
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: hoe
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rdoc
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.10'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.10'
+- !ruby/object:Gem::Dependency
+  name: hoe
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 2
-        - 6
-        - 2
-        version: 2.6.2
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.5'
   type: :development
-  version_requirements: *id004
-description: |-
-  This extension of Chef::Handler creates reports in Condor class ad format and posts
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.5'
+description: ! 'This extension of Chef::Handler creates reports in Condor class ad
+  format and posts
+
   them to an amqp-complient message broker. This report handler was created to produce
-  reports for the CycleServer Chef Dashboard available from Cycle Computing LLC.
-email: 
+
+  reports for the CycleServer Chef Dashboard available from Cycle Computing LLC.'
+email:
 - chris.chalfant@cyclecomputing.com
-executables: 
+executables:
 - cycle_chef_handler
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - History.txt
 - Manifest.txt
 - README.txt
-files: 
+files:
 - .autotest
 - History.txt
 - Manifest.txt
@@ -98,39 +115,33 @@ files:
 - bin/cycle_chef_handler
 - lib/cycle_chef_handler.rb
 - test/test_cycle_chef_handler.rb
+- .gemtest
 homepage: http://github.com/cyclecomputing/cycle_chef_handler
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --main
 - README.txt
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: cycle_chef_handler
-rubygems_version: 1.8.7
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
-summary: This extension of Chef::Handler creates reports in Condor class ad format and posts them to an amqp-complient message broker
-test_files: 
+summary: This extension of Chef::Handler creates reports in Condor class ad format
+  and posts them to an amqp-complient message broker
+test_files:
 - test/test_cycle_chef_handler.rb