Changeset 375

Timestamp:

02/03/12 09:43:59 (4 months ago)

Author:

nelsonab

Message:

sync svn with local

Location:

trunk/ruby

Files:

• agent/agent_libs (added)
• agent/agent_libs/plugin.rb (added)
• api/zbxapi.rb (modified) (1 diff)
• api/zbxapi/revision.rb (modified) (1 diff)
• zabcon/libs/zabbix_server.rb (modified) (1 diff)
• zabcon/libs/zabcon_commands.rb (modified) (1 diff)
• zabcon/libs/zabcon_core.rb (modified) (2 diffs)

trunk/ruby/api/zbxapi.rb

@@ -202 +202 @@
     rescue Errno::ECONNREFUSED
       raise ZbxAPI_ExceptionBadServerUrl
+    rescue => e
+      raise ZbxAPI_ExceptionBadAuth.new('General Login error, check host connectivity.')
     end
   end

trunk/ruby/api/zbxapi/revision.rb

@@ -5 +5 @@
 
 ZBXAPI_VERSION="0.1"
-ZBXAPI_REVISION="369"
+ZBXAPI_REVISION="371"

trunk/ruby/zabcon/libs/zabbix_server.rb

@@ -105 +105 @@
   def login(server={})
     @credentials.merge!(server)
-    #@server_url = server["server"] || @server_url
-    #@username = server["username"] || @username
-    #@password = server["password"] || @password
 
     error_msg=[]

trunk/ruby/zabcon/libs/zabcon_commands.rb

@@ -364 +364 @@
   #  params
   #end
-  set_flag :login_required
+#  set_flag :login_required
   set_flag :print_output
   set_help_tag :raw_api

trunk/ruby/zabcon/libs/zabcon_core.rb

@@ -165 +165 @@
     rescue ZbxAPI_ExceptionLoginPermission
       puts "Failed to load previous session key" if env["echo"]
+    rescue Errno::ECONNREFUSED
+      puts "Failed to load previous session key" if env["echo"]
     end
 
@@ -179 +181 @@
       rescue ZbxAPI_ExceptionLoginPermission
         puts "Error Invalid login or no API permissions."
+      rescue ZbxAPI_ExceptionBadServerUrl
+        puts "Error connecting to server"   #TODO Fix message to show hostname
       end
     end