chef-handler-opsmatic 0.0.19 → 0.0.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6e7c0a60f8c7695101d314ff583be40777df95b5
-  data.tar.gz: fd64e0d589118de84d337ba01271223e5f9de84e
+  metadata.gz: fde3b3f817a8f532aaa3a3137d0612e82171526a
+  data.tar.gz: 2ed61bf1132c0c2eeeafe161882dc62e00199f31
 SHA512:
-  metadata.gz: 4f3dd1931cff77b0c12e3350d59524a7e52480d65cdf9c7a003cecec4ec2d6e94507efdb2b4b6bcb342ced4a6ba03051bf33de02e1337914d33efb0276e878d0
-  data.tar.gz: 913f26c5079c6bb0ca51af8f286012d69bc8ab2dc9e9b5fdc9c3f5885d84dbf6b85da7e2ac05e111cff17abe3eef11be2fd32dcca8c547eb264b7dd4631ce1c3
+  metadata.gz: fe69a30172592d9e0085781331459e8ea70de32e2f85d926c2f9979b66675f3e29e9d413c73d25eaed4b1e1283e84326c1ebfbe7ada9ef488bcd1661cbc41886
+  data.tar.gz: 3970261c0b23b9ae3053920db397cbbab14fa1da1cefcb89b20272909bdcfc911cd9418cba578ecc9f9485bf47468247571f4a1975f79b6161b7c042b6aba7e3

data/lib/chef/handler/opsmatic.rb

@@ -63,7 +63,7 @@ class Chef
         end
 
         # if there's an exception include details in event
-        if !run_status.exception.nil? 
+        if !run_status.exception.nil?
           clean_exception = run_status.formatted_exception.encode('UTF-8', {:invalid => :replace, :undef => :replace, :replace => '?'})
           opsmatic_event[:data][:exception] = clean_exception
         end
@@ -109,7 +109,7 @@ class Chef
           File.open("#{data_dir}/chef_resources.json", "w") do |f|
             watchlist = []
             @watch_files.keys.each do |k|
-              watchlist << { "path" => k } 
+              watchlist << { "path" => k }
             end
             f.write({ "files" => watchlist }.to_json)
           end
@@ -135,9 +135,9 @@ class Chef
       end
 
       # submit report to the opsmatic collector
-      def submit(event) 
+      def submit(event)
         Chef::Log.info("Posting chef run report to Opsmatic")
-        
+
         url = URI.parse(@config[:collector_url])
 
         qs = url.query.nil? ? [] : url.query.split("&")
@@ -157,8 +157,15 @@ class Chef
           http = Net::HTTP.new(url.host, url.port)
         end
 
-        http.open_timeout = 2
-        http.read_timeout = 2
+        timeout = @config[:timeout]
+        if timeout.nil?
+          timeout = 5
+        else
+          timeout = Integer(timeout)
+        end
+
+        http.open_timeout = timeout
+        http.read_timeout = timeout
         http.use_ssl = (url.scheme == 'https')
 
         if not @config[:ssl_peer_verify]
@@ -179,7 +186,7 @@ class Chef
           end
         rescue Timeout::Error
           Chef::Log.warn("Timed out connecting to Opsmatic event service, chef run wasn't recorded")
-        rescue Exception => msg 
+        rescue Exception => msg
           Chef::Log.warn("An unhandled execption occured while posting event to Opsmatic event service: #{msg}")
         end
       end
@@ -235,4 +242,4 @@ class Chef
       end
     end
   end
-end
+end

data/lib/chef/handler/opsmatic_version.rb

@@ -1,7 +1,7 @@
 class Chef
   class Handler
     class Opsmatic < ::Chef::Handler
-      VERSION = "0.0.19"
+      VERSION = "0.0.20"
     end
   end
 end

data/spec/opsmatic_spec.rb

@@ -12,7 +12,8 @@ describe "Chef::Handler::Opsmatic" do
     @handler = Chef::Handler::Opsmatic.new(
       :integration_token => INTEGRATION_TOKEN,
       :collector_url => COLLECTOR_URL,
-      :agent_dir => "/var/tmp/opsmatic"
+      :agent_dir => "/var/tmp/opsmatic",
+      :timeout => "10"
     )
 
     @node = Chef::Node.build(HOSTNAME)

metadata

@@ -1,83 +1,83 @@
 --- !ruby/object:Gem::Specification
 name: chef-handler-opsmatic
 version: !ruby/object:Gem::Version
-  version: 0.0.19
+  version: 0.0.20
 platform: ruby
 authors:
 - Opsmatic Engineering
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-07 00:00:00.000000000 Z
+date: 2015-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.6'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: chef
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Chef report handler for sending run detail information to Opsmatic
@@ -87,7 +87,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
+- .gitignore
 - Gemfile
 - LICENSE.md
 - README.md
@@ -107,17 +107,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.1
+rubygems_version: 2.1.11
 signing_key: 
 specification_version: 4
 summary: Chef report handler for sending run detail information to Opsmatic