zbxapi 0.1.292 → 0.1.294

data/zbxapi.rb

@@ -19,8 +19,8 @@
 #--
 ##########################################
 # Subversion information
-# $Id: zbxapi.rb 292 2011-07-08 06:15:38Z nelsonab $
-# $Revision: 292 $
+# $Id: zbxapi.rb 294 2011-07-08 08:27:45Z nelsonab $
+# $Revision: 294 $
 ##########################################
 #++
 
@@ -144,8 +144,6 @@ class ZabbixAPI
   #  1. The url used to create the class was bad
   #  1. The connection to the server was refused
   def login(user='',password='',save=true)
-#    p user.class
-#    p password.class
     if user.class!=String or password.class!=String
       raise ZbxAPI_ExceptionBadAuth.new,'Login called with non-string values'
     end
@@ -159,35 +157,42 @@ class ZabbixAPI
     elsif (@user_name!='' and @password!='') then
       l_user = @user_name
       l_password = @password
-    else
-
     end
 
+    #Somewhere in the 1.8.x cycle it was decided to do deprecate with user.authenticate
+    #however it was not documented well, so we will try uer.login first, and fall
+    #back to user.authenticate as user.login does not exist in 1.8.3
+    login_methods=["user.login","user.authenticate"]
+
     begin
-      result = do_request(json_obj('user.authenticate',{'user'=>l_user,'password'=>l_password}))
+      result = do_request(json_obj(login_methods.first,{'user'=>l_user,'password'=>l_password}))
       @auth=result['result']
 
       #setup the version variables
       @major,@minor=do_request(json_obj('APIInfo.version',{}))['result'].split('.')
       @major=@major.to_i
       @minor=@minor.to_i
-
+    rescue ZbxAPI_ExceptionLoginPermission => e
+      login_methods.delete_at(0)
+      if !login_methods.empty?
+        retry
+      else
+        raise e
+      end
     rescue SocketError
       raise ZbxAPI_ExceptionBadServerUrl
     rescue JSON::ParserError
       raise ZbxAPI_ExceptionBadServerUrl
     rescue Errno::ECONNREFUSED
       raise ZbxAPI_ExceptionBadServerUrl
-    rescue ZbxAPI_GeneralError => e
-      if e.message["code"]==-32602
-        raise ZbxAPI_ExceptionBadAuth,'Bad username and/or password'
-      else
-        raise e
-      end
     end
 
   end
 
+  def logout
+    do_request(json_obj('user.logout'))
+  end
+
   # Tests to determine if the login information is still valid
   # returns: true if it is valid  or false if it is not.
   def test_login

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: zbxapi
 version: !ruby/object:Gem::Version 
-  hash: 595
+  hash: 599
   prerelease: false
   segments: 
   - 0
   - 1
-  - 292
-  version: 0.1.292
+  - 294
+  version: 0.1.294
 platform: ruby
 authors: 
 - A. Nelson