zbxapi 0.1 → 0.1.1

data/libs/api_exceptions.rb

@@ -29,11 +29,8 @@
 #
 #------------------------------------------------------------------------------
 
-#setup our search path or libraries
-path=File.expand_path(File.dirname(__FILE__) + "/./")+"/"
-
-require path+'zdebug'
-require path+'exceptions'
+require 'libs/zdebug'
+require 'libs/exceptions'
 
 #------------------------------------------------------------------------------
 #

data/libs/exceptions.rb

@@ -17,14 +17,11 @@
 
 ##########################################
 # Subversion information
-# $Id: exceptions.rb 254 2010-12-27 19:45:42Z nelsonab $
-# $Revision: 254 $
+# $Id: exceptions.rb 258 2010-12-28 22:49:21Z nelsonab $
+# $Revision: 258 $
 ##########################################
 
-#setup our search path or libraries
-path=File.expand_path(File.dirname(__FILE__) + "/./")+"/"
-
-require path+'zdebug'
+require 'libs/zdebug'
 
 #------------------------------------------------------------------------------
 #

data/libs/zdebug.rb

@@ -76,7 +76,7 @@ module ZDebug
         strval="nil"
       elsif variable.class==String
         strval=variable
-        if !truncate.nil?
+        if !truncate.nil? && truncate>0
           if truncate<strval.length then
             o_strval=strval
             strval=o_strval[0..(truncate/2)]

data/zbxapi.rb

@@ -19,17 +19,16 @@
 #--
 ##########################################
 # Subversion information
-# $Id: zbxapi.rb 254 2010-12-27 19:45:42Z nelsonab $
-# $Revision: 254 $
+# $Id: zbxapi.rb 268 2011-01-02 18:52:37Z nelsonab $
+# $Revision: 268 $
 ##########################################
 #++
 
 #setup our search path or libraries
-path=File.expand_path(File.dirname(__FILE__) + "/./")+"/"
+$: << File.expand_path(File.join(File.dirname(__FILE__), '.'))
 
-
-require path+'libs/zdebug'
-require path+'libs/api_exceptions.rb'
+require 'libs/zdebug'
+require 'libs/api_exceptions.rb'
 require 'uri'
 #require 'net/http'
 require 'net/https'
@@ -236,7 +235,9 @@ class ZabbixAPI
   end
 
   #Sends JSON encoded string to server
-  def do_request(json_obj)
+  #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)
     #puts json_obj
     redirects=0
     begin  # This is here for redirects
@@ -250,13 +251,16 @@ class ZabbixAPI
         'User-Agent'=>'Zbx Ruby CLI'}
       debug(4,"Sending: #{json_obj}")
       response = http.post(@url.path, json_obj,headers)
-      if response.code=="301"
-        puts "Redirecting to #{response['location']}"
-        @url=URI.parse(response['location'])
-				raise Redirect
-      end
       debug(4,"Response Code: #{response.code}")
-      debug(4,response.body,"Response Body",5000)
+      debug(4,response.body,"Response Body",truncate_length)
+      case response.code.to_i
+        when 301
+          puts "Redirecting to #{response['location']}"
+          @url=URI.parse(response['location'])
+				  raise Redirect
+        when 500
+          raise ZbxAPI_GeneralError.new("Zabbix server returned an internal error\n Call: #{json_obj}", :retry=>true)
+      end
 #    end
 
       @id+=1  # increment the ID value for the API call

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: zbxapi
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 25
   prerelease: false
   segments: 
   - 0
   - 1
-  version: "0.1"
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - A. Nelson
@@ -14,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-28 00:00:00 -05:00
+date: 2011-04-06 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency