zbxapi 0.3.4 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2875a49d1ac86922d840ba86955f8f29e0ee6c20
-  data.tar.gz: dd930c750c1fe6c3274623b73c425de79fda60f9
+  metadata.gz: 88ef5fabf6b47c81073ee97d551d2dd6f7b7a40f
+  data.tar.gz: 3633af6eae3cd25cf5aeca8b4aba490c39a6fb5c
 SHA512:
-  metadata.gz: 72464276ff6455cdb961917c96aff7ea542b69f1125c24d8317c02fe6b1f372ee8bb4aa8af38b9680f6dbd693f1313cfe9e8ff1ce577cdb9f63d9c0a519c1952
-  data.tar.gz: 99f7beb1db9f7103ba84c5d75b33dbeb1439939afe41479e4d22888e3df350cec5183ae773f3fc2e0eec78e947fd4fcc4cf2420860fb3f82f03a7620cd794b24
+  metadata.gz: dcf4b2b1306f21755a4504e12fc1fadeebfc4333a5affda34e7b8cfd48fee1e63a741d50826b74836f573346b28b0f53c752c8611c1907d37f6d257d39a953f2
+  data.tar.gz: eee2dbb07f1b22cb7063fd6a687514c66057c3a5bf411274e029d530fbe8afd5de18ce39029c186bea599817caac7c8a6634468cfcfae16f3341637e294190dc

data/zbxapi.rb

@@ -125,7 +125,8 @@ class ZabbixAPI
     if options.has_key?:http_timeout
       @http_timeout=options[:http_timeout]
     else
-      @http_timeout=true
+      #if not set, default http read_timeout=60
+      @http_timeout=nil
     end
 
     #Generate the list of sub objects dynamically, from all objects
@@ -377,6 +378,8 @@ class ZabbixAPI
     if !@verify_ssl
       http.verify_mode = OpenSSL::SSL::VERIFY_NONE if @url.class==URI::HTTPS
     end
+    http.read_timeout=@http_timeout unless @http_timeout.nil?
+
     http
   end
 
@@ -431,12 +434,6 @@ class ZabbixAPI
       raise ZbxAPI_GeneralError.new("Unable to connect to #{@url.host}: \"#{e}\"", :retry=>false)
     end
   end
-
-  def setup_connection
-    @http=Net::HTTP.new(@url.host, @url.port)
-    http.use_ssl=true if @url.class==URI::HTTPS
-    http.timeout=@http_timeout
-  end
 end
 
 #******************************************************************************

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zbxapi
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.5
 platform: ruby
 authors:
 - A. Nelson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-27 00:00:00.000000000 Z
+date: 2014-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json