zbxapi 0.1.369 → 0.1.386

data/zbxapi.rb

@@ -19,8 +19,8 @@
 #--
 ##########################################
 # Subversion information
-# $Id: zbxapi.rb 369 2011-12-22 05:17:06Z nelsonab $
-# $Revision: 369 $
+# $Id: zbxapi.rb 386 2012-04-23 07:01:49Z nelsonab $
+# $Revision: 386 $
 ##########################################
 #++
 
@@ -70,7 +70,7 @@ class ZabbixAPI
 
   include ZDebug
 
-  attr_accessor :method, :params, :debug_level, :auth
+  attr_accessor :method, :params, :debug_level, :auth, :verify_ssl
 
   #subordinate class
   attr_accessor :user # [User#new]
@@ -79,6 +79,7 @@ class ZabbixAPI
   @id=0
   @auth=''
   @url=nil
+  @verify_ssl = true
 
   private
     @user_name=''
@@ -201,6 +202,8 @@ class ZabbixAPI
       raise ZbxAPI_ExceptionBadServerUrl
     rescue Errno::ECONNREFUSED
       raise ZbxAPI_ExceptionBadServerUrl
+    rescue => e
+      raise ZbxAPI_ExceptionBadAuth.new('General Login error, check host connectivity.')
     end
   end
 
@@ -269,19 +272,27 @@ class ZabbixAPI
 
   end
 
+  def get_http_obj
+    if @proxy
+      http = Net::HTTP::Proxy(@proxy[:address],@proxy[:port],
+            @proxy[:user],@proxy[:password]).new(@url.host,@url.port)
+    else
+      http = Net::HTTP.new(@url.host, @url.port)
+    end
+    http.use_ssl=true if @url.class==URI::HTTPS
+    if ! @verify_ssl
+      http.verify_mode = OpenSSL::SSL::VERIFY_NONE if @url.class==URI::HTTPS
+    end
+    http
+  end
+
   #Sends JSON encoded string to server
   #truncate_length determines how many characters at maximum should be displayed while debugging before
   #truncation should occur.
   def do_request(json_obj,truncate_length=5000)
     redirects=0
     begin  # This is here for redirects
-      if @proxy
-        http = Net::HTTP::Proxy(@proxy[:address],@proxy[:port],
-              @proxy[:user],@proxy[:password]).new(@url.host,@url.port)
-      else
-        http = Net::HTTP.new(@url.host, @url.port)
-      end
-      http.use_ssl=true if @url.class==URI::HTTPS
+      http=get_http_obj
       response = nil
       headers={'Content-Type'=>'application/json-rpc',
         'User-Agent'=>'Zbx Ruby CLI'}
@@ -323,7 +334,7 @@ class ZabbixAPI
 			retry if redirects<=5
 			raise ZbxAPI_GeneralError, "Too many redirects"
     rescue NoMethodError
-      raise ZbxAPI_GeneralError.new("Unable to connect to #{@url.host}", :retry=>false)
+      raise ZbxAPI_GeneralError.new("Unable to connect to #{@url.host} : \"#{e}\"", :retry=>false)
     end
   end
 

data/zbxapi/revision.rb

@@ -4,4 +4,4 @@
 #the rakefile was run
 
 ZBXAPI_VERSION="0.1"
-ZBXAPI_REVISION="369"
+ZBXAPI_REVISION="386"

metadata

@@ -1,13 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: zbxapi
 version: !ruby/object:Gem::Version 
-  hash: 761
-  prerelease: false
-  segments: 
-  - 0
-  - 1
-  - 369
-  version: 0.1.369
+  version: 0.1.386
 platform: ruby
 authors: 
 - A. Nelson
@@ -15,23 +9,19 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-22 00:00:00 -05:00
+date: 2012-04-23 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: json
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
-  type: :runtime
-  version_requirements: *id001
+    version: 
 description: Provides a straight forward interface to manipulate Zabbix servers using the Zabbix API.
 email: nelsonab@red-tux.net
 executables: []
@@ -68,27 +58,21 @@ rdoc_options: []
 require_paths: 
 - .
 required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
+  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
+  version: 
 requirements: 
 - Requires json
 rubyforge_project: zbxapi
-rubygems_version: 1.3.7
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: Ruby wrapper to the Zabbix API