zbxapi 0.1.294 → 0.1.324

data/api_classes/application.rb

@@ -46,7 +46,7 @@ require "api_classes/subclass_base"
 
 class ZbxAPI_Application < ZbxAPI_Sub
   def get(options={})
-    debug(8, "Application.get Start")
+    debug(8, :msg=>"Application.get Start")
     checkauth
     checkversion(1,1)
 
@@ -55,7 +55,7 @@ class ZbxAPI_Application < ZbxAPI_Sub
   end
 
   def create(options={})
-    debug(8, "Application.create Start")
+    debug(8, :msg=>"Application.create Start")
     checkauth
     checkversion(1,1)
 
@@ -70,7 +70,7 @@ class ZbxAPI_Application < ZbxAPI_Sub
   end
 
   def getid(options={})
-    debug(8, "Application.getid Start")
+    debug(8, :msg=>"Application.getid Start")
     checkauth
     checkversion(1,1)
 

data/api_classes/host_group.rb

@@ -47,7 +47,7 @@ require "api_classes/subclass_base"
 
 class ZbxAPI_HostGroup < ZbxAPI_Sub
   def create(options={})
-    debug(8, "HostGroup.create Start")
+    debug(8, :msg=>"HostGroup.create Start")
     checkauth
     checkversion(1,1)
 
@@ -62,7 +62,7 @@ class ZbxAPI_HostGroup < ZbxAPI_Sub
   end
 
   def get(options={})
-    debug(8, "HostGroup.get Start")
+    debug(8, :msg=>"HostGroup.get Start")
     checkauth
     checkversion(1,1)
 
@@ -76,7 +76,7 @@ class ZbxAPI_HostGroup < ZbxAPI_Sub
   end
 
   def getObjects(name)
-    debug(8, "HostGroup.getId Start")
+    debug(8, :msg=>"HostGroup.getId Start")
     checkauth
     checkversion(1,1)
 

data/api_classes/item.rb

@@ -59,7 +59,7 @@ class ZbxAPI_Item < ZbxAPI_Sub
   end
 
   def create(options)
-    debug(8,options)
+    debug(8,:var=>options)
     checkauth
     checkversion(1,1)
 

data/api_classes/subclass_base.rb

@@ -53,7 +53,7 @@ class ZbxAPI_Sub < ZabbixAPI #:nodoc: all
     return @parent.json_obj(method, param)
   end
 
-  def debug(level,param="",message=nil)
-    @parent.debug(level,param,message)
+  def debug(level,args={})
+    @parent.debug(level,args)
   end
 end

data/api_classes/sysmap.rb

@@ -39,7 +39,7 @@ require "api_classes/subclass_base"
 
 class ZbxAPI_Sysmap < ZbxAPI_Sub
   def create(options={})
-    debug(8, "Sysmap.create Start")
+    debug(8, :msg=>"Sysmap.create Start")
     checkauth
     checkversion(1,1)
 
@@ -54,7 +54,7 @@ class ZbxAPI_Sysmap < ZbxAPI_Sub
   end
 
   def addelement(options={})
-    debug(8, "Sysmap.addelement Start")
+    debug(8, :msg=>"Sysmap.addelement Start")
     checkauth
     checkversion(1,1)
 
@@ -63,7 +63,7 @@ class ZbxAPI_Sysmap < ZbxAPI_Sub
   end
 
   def addlink(options={})
-    debug(8, "Sysmap.addlink Start")
+    debug(8, :msg=>"Sysmap.addlink Start")
     checkauth
     checkversion(1,1)
 
@@ -72,7 +72,7 @@ class ZbxAPI_Sysmap < ZbxAPI_Sub
   end
 
   def getseid(options={})
-    debug(8, "Sysmap.getseid Start")
+    debug(8, :msg=>"Sysmap.getseid Start")
     checkauth
     checkversion(1,1)
 
@@ -81,7 +81,7 @@ class ZbxAPI_Sysmap < ZbxAPI_Sub
   end
 
   def addlinktrigger(options={})
-    debug(8, "Sysmap.addlinktrigger Start")
+    debug(8, :msg=>"Sysmap.addlinktrigger Start")
     checkauth
     checkversion(1,1)
 

data/api_classes/trigger.rb

@@ -45,7 +45,7 @@ require "api_classes/subclass_base"
 
 class ZbxAPI_Trigger < ZbxAPI_Sub
   def get(options={})
-    debug(8, "Trigger.get Start")
+    debug(8, :msg=>"Trigger.get Start")
     checkauth
     checkversion(1,1)
 
@@ -55,7 +55,7 @@ class ZbxAPI_Trigger < ZbxAPI_Sub
 
   # Function name changed to reflect 1.1 API changes
   def create(options={})
-    debug(8, "Trigger.create Start")
+    debug(8, :msg=>"Trigger.create Start")
     checkauth
     checkversion(1,1)
 

data/api_classes/user.rb

@@ -109,7 +109,7 @@ class ZbxAPI_User < ZbxAPI_Sub
   # addmedia expects a hash of the following variables
   # userid, mediatypeid, sendto, severity, active, period
   def addmedia(options)
-    debug(8, "User.addmedia Start")
+    debug(8, :msg=>"User.addmedia Start")
     checkauth
     checkversion(1,1)
 

data/{libs → zbxapi}/api_exceptions.rb

@@ -17,8 +17,8 @@
 
 ##########################################
 # Subversion information
-# $Id:  $
-# $Revision:  $
+# $Id: api_exceptions.rb 319 2011-09-25 21:53:30Z nelsonab $
+# $Revision: 319 $
 ##########################################
 
 #------------------------------------------------------------------------------
@@ -29,8 +29,8 @@
 #
 #------------------------------------------------------------------------------
 
-require 'libs/zdebug'
-require 'libs/exceptions'
+require 'zbxapi/zdebug'
+require 'zbxapi/exceptions'
 
 #------------------------------------------------------------------------------
 #
@@ -40,7 +40,7 @@ require 'libs/exceptions'
 #
 #------------------------------------------------------------------------------
 
-class ZbxAPI_ExceptionBadAuth < RuntimeError
+class ZbxAPI_ExceptionBadAuth < ZError
 end
 
 #------------------------------------------------------------------------------
@@ -97,7 +97,7 @@ end
 #------------------------------------------------------------------------------
 
 class ZbxAPI_ExceptionLoginPermission < ZError
-  def initialize(message=nil, params=nil)
+  def initialize(message=nil, params={})
     super(message, params)
     @local_msg="This is also a general Zabbix API error number (Your error may not be a login error).\nTell the Zabbix devs to honor section 5.1 of the JSON-RPC 2.0 Spec."
   end

data/{libs → zbxapi}/exceptions.rb

@@ -17,11 +17,12 @@
 
 ##########################################
 # Subversion information
-# $Id: exceptions.rb 258 2010-12-28 22:49:21Z nelsonab $
-# $Revision: 258 $
+# $Id: exceptions.rb 319 2011-09-25 21:53:30Z nelsonab $
+# $Revision: 319 $
 ##########################################
 
-require 'libs/zdebug'
+require 'zbxapi/utils'
+require 'zbxapi/zdebug'
 
 #------------------------------------------------------------------------------
 #
@@ -34,18 +35,17 @@ class ZError < RuntimeError
 
   include ZDebug
 
-  attr_accessor :help_func, :message, :retry
+  attr_accessor :help_func, :message, :retry, :error_code
 
   # list of valid params
   # :help_func, the help function with more information for the exception
-  # : retry, is the exception eligable for retry?
-  def initialize(message=nil, params=nil)
-    raise "Exception not called correctly" if params.class!=Hash if !params.nil?
-    params={} if params.nil?
+  # : retry, is the exception eligible for retry?
+  def initialize(message=nil, params={})
     @help_func=params[:help_func]
     @message=message
     @local_msg="Error"
     @retry = params[:retry]
+    @error_code= params[:error_code]
     super(message)
   end
 

data/zbxapi/revision.rb

@@ -0,0 +1,7 @@
+#CHANGES TO THIS FILE WILL AUTOMATICALLY BE OVERWRITTEN
+#This file is autogenerated by the zbxapi rakefile.
+#This file contains the latest SVN revision number at the time
+#the rakefile was run
+
+ZBXAPI_VERSION="0.1"
+ZBXAPI_REVISION="324"

data/zbxapi/utils.rb

@@ -0,0 +1,38 @@
+#License:: LGPL 2.1   http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html
+#Copyright:: Copyright (C) 2009,2010 Andrew Nelson nelsonab(at)red-tux(dot)net
+#
+#This library is free software; you can redistribute it and/or
+#modify it under the terms of the GNU Lesser General Public
+#License as published by the Free Software Foundation; either
+#version 2.1 of the License, or (at your option) any later version.
+#
+#This library is distributed in the hope that it will be useful,
+#but WITHOUT ANY WARRANTY; without even the implied warranty of
+#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+#Lesser General Public License for more details.
+#
+#You should have received a copy of the GNU Lesser General Public
+#License along with this library; if not, write to the Free Software
+#Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+##########################################
+# Subversion information
+# $Id: utils.rb 319 2011-09-25 21:53:30Z nelsonab $
+# $Revision: 319 $
+##########################################
+
+
+class Object
+  #self.class_of?
+  #Ruby's is_a? or kind_of? will only tell you the hierarchy of classes which
+  #have been instantiated.
+  def self.class_of?(obj)
+    raise RuntimeError.new("Obj must be an uninstantiated class, often calling method \".class\" works") if obj.class!=Class
+    return true if self==obj
+    if self.superclass.respond_to?(:class_of?)
+      self.superclass.class_of?(obj)
+    else
+      false
+    end
+  end
+end

data/zbxapi/zdebug.rb

@@ -0,0 +1,165 @@
+#License:: LGPL 2.1   http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html
+#Copyright:: Copyright (C) 2009,2010 Andrew Nelson nelsonab(at)red-tux(dot)net
+#
+#This library is free software; you can redistribute it and/or
+#modify it under the terms of the GNU Lesser General Public
+#License as published by the Free Software Foundation; either
+#version 2.1 of the License, or (at your option) any later version.
+#
+#This library is distributed in the hope that it will be useful,
+#but WITHOUT ANY WARRANTY; without even the implied warranty of
+#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+#Lesser General Public License for more details.
+#
+#You should have received a copy of the GNU Lesser General Public
+#License along with this library; if not, write to the Free Software
+#Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+##########################################
+# Subversion information
+# $Id: zdebug.rb 324 2011-09-26 08:53:11Z nelsonab $
+# $Revision: 324 $
+##########################################
+
+module ZDebug
+
+  # Either set_debug_level or set_facility_debug_level must be called before
+  # the debug functions can be used.
+  def set_debug_level(level)   # sets the current debug level for printing messages
+    @@debug_level=level
+
+    # Create faciltiy_level if it's not created already
+    @@facility_level= {} if !defined?(@@facility_level)
+  end
+
+  # facility is a symbol, level is an integer
+  def set_facility_debug_level(facility,level)
+    # Create faciltiy_level if it's not created already
+    @@facility_level= {} if !defined?(@@facility_level)
+
+    @@facility_level[facility]=level
+
+    # Create debug level if it's not already created
+    @@debug_level=0 if !defined?(@@debug_level)
+  end
+
+  def debug_level
+    @@debug_level
+  end
+
+  # level - level to show message (Integer)
+  # :var - variable to show (Object)
+  # :msg - message to be prepended before variable  (String)
+  # :truncate - truncate var if it is over N characters
+  # :overload - do not show or error if debug_level is not set
+  # :facility - Which debug facility level should also be used
+  # :stack_pos - Stack position to use for calling function information (0==last function)
+  # :trace_depth - Show a backtrace of :trace_depth starting at :stack_pos
+  def debug(level,args={})
+    variable=args[:var] || :zzempty
+    message=args[:msg] || nil
+    facility=args[:facility] || nil
+    raise "Facility must be a symbol" if facility && facility.class!=Symbol
+    truncate=args[:truncate] || 0
+    raise "Truncate must be an Integer" if truncate.class!=Fixnum
+    overload=(!args[:overload].nil? && args[:overload]==true) || false
+    stack_pos=args[:stack_pos] || 0
+    raise ":stack_pos must be an Integer" if stack_pos.class!=Fixnum
+    backtrace_depth=args[:trace_depth] || 0
+
+    return if overload
+    raise "Call set_debug before using debug" if !defined?(@@debug_level)
+
+    if facility
+      facility_level=@@facility_level[facility]
+      raise("Unknown facility type: #{facility.to_s}") if facility_level.nil?
+      show_debug=level<=facility_level
+    else
+      show_debug=level<=@@debug_level
+    end
+
+    if show_debug
+
+      if facility
+        header="D#{level}(#{facility.to_s})"
+      else
+        header="D#{level}"
+      end
+
+      #Example:  "./libs/lexer.rb:650:in `item'"
+      #parse the caller array to determine who called us, what line, and what file
+      caller[stack_pos]=~/(.*):(\d+):.*`(.*?)'/
+
+      if $1
+        #sometimes the debug function gets called from within an exception block, in which cases the backtrace is not
+        #available.
+        path=$1
+        debug_line=$2
+        debug_func=$3
+        path=path.split("/")
+
+        if (len=path.length)>2
+          debug_file=".../#{path[len-2]}/#{path[len-1]}"
+        else
+          debug_file=path
+        end
+
+        header+=" #{debug_file}:#{debug_func}:#{debug_line}"
+      else
+        header+=" --from exception--"
+      end
+
+      if variable.nil?
+        strval="nil"
+      elsif variable==:zzempty || variable==""
+        strval=""
+      elsif variable.class==String
+        strval=variable
+      else
+        strval=variable.inspect
+      end
+
+      if truncate>0 && truncate<strval.length
+        o_strval=strval
+        strval=o_strval[0..(truncate/2)]
+        strval+= "  .....  "
+        strval+=o_strval[(o_strval.length-(truncate/2))..o_strval.length]
+      end
+
+      if message
+        strval = variable==:zzempty ?
+            message :
+            message + ": " + strval
+      end
+      puts "#{header} #{strval}"
+
+      if backtrace_depth>0
+        backtrace=[]
+        (stack_pos..stack_pos+backtrace_depth-1).each do |pos|
+          pos+=2 #Need to offset current block
+          next if pos>=caller.length
+
+          caller[pos]=~/(.*):(\d+):.*`(.*?)'/
+          if $1
+            #sometimes the debug function gets called from within an exception block, in which cases the backtrace is not
+            #available.
+            debug_line=$2
+            debug_func=$3
+            path=$1.split("/")  #global vars are changed by split
+
+            path= (len=path.length)>2 ? ".../#{path[len-2]}/#{path[len-1]}" : path
+            backtrace<<"#{path}:#{debug_func}:#{debug_line}"
+          else
+            backtrace<<"Unknown"
+          end
+        end
+        puts " Backtrace(#{stack_pos}..#{stack_pos+backtrace_depth-1}):["+backtrace.join("],[")+"]"
+      end
+    end
+  end
+
+  def debug_facility(facility,level,variable="",message=nil,truncate=nil)
+    debug(level, :var=>variable, :msg=>message, :truncate=>truncate, :stack_pos=>1)
+  end
+
+end  # end Debug module

data/zbxapi.rb

@@ -19,8 +19,8 @@
 #--
 ##########################################
 # Subversion information
-# $Id: zbxapi.rb 294 2011-07-08 08:27:45Z nelsonab $
-# $Revision: 294 $
+# $Id: zbxapi.rb 319 2011-09-25 21:53:30Z nelsonab $
+# $Revision: 319 $
 ##########################################
 #++
 
@@ -32,8 +32,9 @@ end
 #setup our search path or libraries
 $: << File.expand_path(File.join(File.dirname(__FILE__), '.'))
 
-require 'libs/zdebug'
-require 'libs/api_exceptions.rb'
+require 'zbxapi/revision'
+require 'zbxapi/zdebug'
+require 'zbxapi/api_exceptions.rb'
 require 'uri'
 #require 'net/http'
 require 'net/https'
@@ -105,9 +106,13 @@ class ZabbixAPI
     @history = ZbxAPI_History.new(self)
     @id=0
 
-    debug(6,"protocol: #{@url.scheme}, host: #{@url.host}")
-    debug(6,"port: #{@url.port}, path: #{@url.path}")
-    debug(6,"query: #{@url.query}, fragment: #{@url.fragment}")
+    debug(6,:msg=>"protocol: #{@url.scheme}, host: #{@url.host}")
+    debug(6,:msg=>"port: #{@url.port}, path: #{@url.path}")
+    debug(6,:msg=>"query: #{@url.query}, fragment: #{@url.fragment}")
+  end
+
+  def self.get_version
+    "#{ZBXAPI_VERSION}.#{ZBXAPI_REVISION}"
   end
 
   #wraps the given information into the appropriate JSON object
@@ -123,7 +128,7 @@ class ZabbixAPI
         'auth'=>@auth,
         'id'=>@id
       }
-    debug(10, "json_obj:  #{obj}")
+    debug(10, :msg=>"json_obj:  #{obj}")
     return obj.to_json
   end
 
@@ -177,7 +182,7 @@ class ZabbixAPI
       if !login_methods.empty?
         retry
       else
-        raise e
+        raise ZbxAPI_ExceptionBadAuth.new('Invalid User or Password',:error_code=>e.error_code)
       end
     rescue SocketError
       raise ZbxAPI_ExceptionBadServerUrl
@@ -230,8 +235,8 @@ class ZabbixAPI
   # _params_ are the parameters to be passed to the call
   # returns a hash of the results from the server
   def raw_api(method,params=nil)
-    debug(6,method,"method")
-    debug(6,params,"Parameters")
+    debug(6,:var=>method,:msg=>"method")
+    debug(6,:var=>params,:msg=>"Parameters")
 
     checkauth
     checkversion(1,1)
@@ -269,10 +274,10 @@ class ZabbixAPI
 #    http.start do |http|
       headers={'Content-Type'=>'application/json-rpc',
         'User-Agent'=>'Zbx Ruby CLI'}
-      debug(4,"Sending: #{json_obj}")
+      debug(4,:msg=>"Sending: #{json_obj}")
       response = http.post(@url.path, json_obj,headers)
-      debug(4,"Response Code: #{response.code}")
-      debug(4,response.body,"Response Body",truncate_length)
+      debug(4,:msg=>"Response Code: #{response.code}")
+      debug(4,:var=>response.body,:msg=>"Response Body",:truncate=>truncate_length)
       case response.code.to_i
         when 301
           puts "Redirecting to #{response['location']}"
@@ -291,9 +296,9 @@ class ZabbixAPI
         errcode=resp["error"]["code"].to_i
         case errcode
           when -32602 then
-            raise ZbxAPI_ExceptionLoginPermission.new(resp["error"],:retry=>true)
+            raise ZbxAPI_ExceptionLoginPermission.new(resp["error"],:error_code=>errcode,:retry=>true)
           when -32500 then
-            raise ZbxAPI_ExceptionPermissionError.new(resp["error"],:retry=>true)
+            raise ZbxAPI_ExceptionPermissionError.new(resp["error"],:error_code=>errcode,:retry=>true)
           else
             puts "other error"
             raise ZbxAPI_GeneralError, resp["error"]

metadata

@@ -1,13 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: zbxapi
 version: !ruby/object:Gem::Version 
-  hash: 599
-  prerelease: false
-  segments: 
-  - 0
-  - 1
-  - 294
-  version: 0.1.294
+  version: 0.1.324
 platform: ruby
 authors: 
 - A. Nelson
@@ -15,23 +9,19 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-08 00:00:00 -04:00
+date: 2011-09-26 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: []
@@ -42,9 +32,11 @@ extra_rdoc_files: []
 
 files: 
 - zbxapi.rb
-- libs/zdebug.rb
-- libs/api_exceptions.rb
-- libs/exceptions.rb
+- zbxapi/zdebug.rb
+- zbxapi/api_exceptions.rb
+- zbxapi/exceptions.rb
+- zbxapi/revision.rb
+- zbxapi/utils.rb
 - api_classes/application.rb
 - api_classes/history.rb
 - api_classes/host.rb
@@ -65,27 +57,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

data/libs/zdebug.rb

@@ -1,163 +0,0 @@
-#License:: LGPL 2.1   http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html
-#Copyright:: Copyright (C) 2009,2010 Andrew Nelson nelsonab(at)red-tux(dot)net
-#
-#This library is free software; you can redistribute it and/or
-#modify it under the terms of the GNU Lesser General Public
-#License as published by the Free Software Foundation; either
-#version 2.1 of the License, or (at your option) any later version.
-#
-#This library is distributed in the hope that it will be useful,
-#but WITHOUT ANY WARRANTY; without even the implied warranty of
-#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-#Lesser General Public License for more details.
-#
-#You should have received a copy of the GNU Lesser General Public
-#License along with this library; if not, write to the Free Software
-#Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-
-##########################################
-# Subversion information
-# $Id: zdebug.rb 281 2011-04-06 18:10:16Z nelsonab $
-# $Revision: 281 $
-##########################################
-
-module ZDebug
-
-  # Either set_debug_level or set_facility_debug_level must be called before
-  # the debug functions can be used.
-  def set_debug_level(level)   # sets the current debug level for printing messages
-    @@debug_level=level
-
-    # Create faciltiy_level if it's not created already
-    @@facility_level= {} if !defined?(@@facility_level)
-  end
-
-  # facility is a symbol, level is an integer
-  def set_facility_debug_level(facility,level)
-    # Create faciltiy_level if it's not created already
-    @@facility_level= {} if !defined?(@@facility_level)
-
-    @@facility_level[facility]=level
-
-    # Create debug level if it's not already created
-    @@debug_level=0 if !defined?(@@debug_level)
-  end
-
-  def debug_level
-    @@debug_level
-  end
-
-  # level - level to show message (Integer)
-  # variable - variable to show (Object)
-  # message - message to be prepended before variable  (String)
-  # overload - do show or error if debug_level is not set
-  def debug(level,variable="",message=nil,truncate=nil,overload=false)
-    return if overload
-    raise "Call set_debug before using debug" if !defined?(@@debug_level)
-    if level<=@@debug_level
-      #parse the caller array to determine who called us, what line, and what file
-      caller[0]=~/(.*):(\d+):.*`(.*?)'/
-
-      #sometimes the debug function gets called from within an exception block, in which cases the backtrace is not
-      #available.
-      file_tmp=$1.nil? ? "n/a" : $1
-      debug_line=$2.nil? ? "" : $2
-      debug_func=$3.nil? ? "" : $3
-      tmp_split=file_tmp.split("/")
-
-      if (len=tmp_split.length)>2
-        debug_file=".../#{tmp_split[len-2]}/#{tmp_split[len-1]}"
-      else
-        debug_file=file_tmp
-      end
-
-      strval=""
-      if variable.nil?
-        strval="nil"
-      elsif variable.class==String
-        strval=variable
-        if !truncate.nil? && truncate>0
-          if truncate<strval.length then
-            o_strval=strval
-            strval=o_strval[0..(truncate/2)]
-            strval+= "  .....  "
-            strval+=o_strval[(o_strval.length-(truncate/2))..o_strval.length]
-          end
-        end
-      else
-        strval=variable.inspect
-        if !truncate.nil?
-          if truncate<strval.length then
-            o_strval=strval
-            strval=o_strval[0..(truncate/2)]
-            strval+= "  .....  "
-            strval+=o_strval[(o_strval.length-(truncate/2))..o_strval.length]
-          end
-        end
-      end
-
-      if !message.nil?
-        strval = message + ": " + strval
-      end
-      puts "D#{level} #{debug_file}:#{debug_func}:#{debug_line} #{strval}"
-    end
-  end
-
-  # Debug_facility is a copy of the above function in an effort to shorten
-  # code path.
-  # facility - symbol denoting logging facility
-  # level - level to show message (Integer)
-  # variable - variable to show (Object)
-  # message - message to be prepended before variable  (String)
-  def debug_facility(facility,level,variable="",message=nil,truncate=nil)
-    facility_level=@@facility_level[facility]
-    raise "Call set_debug before using debug" if !defined?(@@debug_level)
-    raise "Unknown facility type: #{facility.to_s}" if facility_level.nil?
-    if level<=facility_level
-      #parse the caller array to determine who called us, what line, and what file
-      caller[0]=~/(.*):(\d+):.*`(.*?)'/
-
-      file_tmp=$1
-      debug_line=$2
-      debug_func=$3
-      tmp_split=file_tmp.split("/")
-
-      if (len=tmp_split.length)>2
-        debug_file=".../#{tmp_split[len-2]}/#{tmp_split[len-1]}"
-      else
-        debug_file=file_tmp
-      end
-
-      strval=""
-      if variable.nil?
-        strval="nil"
-      elsif variable.class==String
-        strval=variable
-        if !truncate.nil?
-          if truncate<strval.length then
-            o_strval=strval
-            strval=o_strval[0..(truncate/2)]
-            strval+= "  .....  "
-            strval+=o_strval[(o_strval.length-(truncate/2))..o_strval.length]
-          end
-        end
-      else
-        strval=variable.inspect
-        if !truncate.nil?
-          if truncate<strval.length then
-            o_strval=strval
-            strval=o_strval[0..(truncate/2)]
-            strval+= "  .....  "
-            strval+=o_strval[(o_strval.length-(truncate/2))..o_strval.length]
-          end
-        end
-      end
-
-      if !message.nil?
-        strval = message + ": " + strval
-      end
-      puts "D#{level}(#{facility.to_s}) #{debug_file}:#{debug_func}:#{debug_line} #{strval}"
-    end
-  end
-
-end  # end Debug module