zcollective 0.0.16 → 0.0.17

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: b7adf8b3521b3f9dd4ecf84e5231859e41892e8e
+  data.tar.gz: 979c2f035629d4f624fefde42c7af2e1ec43462d
+SHA512:
+  metadata.gz: 645c4a8184df5d0d53015b033f05cf92cca41ea71f4a9802828f9985078a0b17ea2c6cd23d4e6d5163799157a06fa2c61c7521954efea652c5995f64946fe3a2
+  data.tar.gz: be2f2a8c4dc07e032a3232d80f490257c832850f68f5dfd7fc94f5d238f9043591926036dd7e396828ecfc0f72daca132cbea84164150b6dd5bebfab5a00dd09

data/bin/zcollective

@@ -89,6 +89,12 @@ optparse = OptionParser.new do |opts|
         options[:timeout] = t.to_i
     end
 
+    # This timeout matches the default Net::HTTP.read_timeout value.
+    options[:http_timeout] = nil
+    opts.on('--http-timeout', 'Timeout Zabbix API calls after n seconds.') do |hto|
+        options[:http_timeout] = hto
+    end
+
     options[:host]
     opts.on('-h', '--host hostname', 'Skip mcollective host discovery, use the given host') do |h|
         options[:host] = h
@@ -175,10 +181,11 @@ end
 log.debug( "Connecting to Zabbix RPC service" )
 
 zabbix_client = ZCollective::ZabbixClient.new(
-    :url      => options[:zabbix_api_url],
-    :user     => options[:zabbix_user],
-    :password => options[:zabbix_pass],
-    :debug    => options[:debug]
+    :url          => options[:zabbix_api_url],
+    :user         => options[:zabbix_user],
+    :password     => options[:zabbix_pass],
+    :debug        => options[:debug],
+    :http_timeout => options[:http_timeout],
 )
 
 log.debug( "Connected and authenticated" )

data/lib/zcollective/zabbixclient.rb

@@ -98,6 +98,8 @@ module ZCollective
             uri  = URI.parse( @options[:url] )
             proxy = ENV['http_proxy'] ? URI.parse(ENV['http_proxy']) : OpenStruct.new
             http = Net::HTTP::Proxy(proxy.host, proxy.port).new( uri.host, uri.port )
+            http_timeout = @options[:http_timeout]
+            http.read_timeout = http_timeout unless http_timeout.nil?
 
             request = Net::HTTP::Post.new( uri.request_uri )
             request.add_field( 'Content-Type', 'application/json-rpc' )

metadata

@@ -1,30 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: zcollective
 version: !ruby/object:Gem::Version
-  version: 0.0.16
-  prerelease: 
+  version: 0.0.17
 platform: ruby
 authors:
 - Jon Topper
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-27 00:00:00.000000000 Z
+date: 2016-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: netaddr
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.5.0
 description: ZCollective is a tool used to configure Zabbix using data discovered
@@ -39,32 +36,25 @@ files:
 - bin/zcollective
 homepage: http://github.com/scalefactory/zcollective
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 4271424940207899001
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 4271424940207899001
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.0.14
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Zabbix/MCollective integration
 test_files: []