dnsruby 1.1 → 1.2

data/lib/Dnsruby/event_machine_interface.rb

@@ -23,9 +23,9 @@ module Dnsruby
           break
         end
         c, proc = @@timer_procs[timeout]
-        proc.call
         @@timer_procs.delete(timeout)
         @@timer_keys_sorted.delete(timeout)
+        proc.call
       end
         
       if (!@@outstanding_sends.empty?)
@@ -71,21 +71,22 @@ module Dnsruby
     def EventMachineInterface::start_eventmachine
       if (!eventmachine_running?)
         if Resolver.start_eventmachine_loop?
-          TheLog.debug("Starting EventMachine")
+          Dnsruby.log.debug("Starting EventMachine")
           @@started_em_here = true
           @@em_thread = Thread.new {
             EM.run {
-              EventMachine::add_periodic_timer(0.1) {EventMachineInterface::process_timers}
+#              EventMachine::add_periodic_timer(0.1) {EventMachineInterface::process_timers}
+              EventMachine::add_timer(0.1) {EventMachineInterface::process_timers}
               @@df = EventMachine::DefaultDeferrable.new
               @@df.callback{
-                TheLog.debug("Stopping EventMachine")
+                Dnsruby.log.debug("Stopping EventMachine")
                 EM.stop              
                 @@em_thread=nil
               }
             }
           }
         else
-          TheLog.debug("Not trying to start event loop")
+          Dnsruby.log.debug("Not trying to start event loop")
         end
       end
     end
@@ -130,12 +131,12 @@ module Dnsruby
         end
       rescue Exception
         #@TODO@ EM::reactor_running? only introduced in EM v0.9.0 - if it's not there, we simply don't know what to do...
-        TheLog.error("EventMachine::reactor_running? not available.")
+        Dnsruby.log.error("EventMachine::reactor_running? not available.")
         #        if Resolver.start_eventmachine_loop?
-        #          TheLog.debug("Trying to start event loop - may prove fatal...")
+        #          Dnsruby.log.debug("Trying to start event loop - may prove fatal...")
         start_eventmachine
         #        else
-        #          TheLog.debug("Not trying to start event loop.")
+        #          Dnsruby.log.debug("Not trying to start event loop.")
         #        end
       end
       df = nil
@@ -157,8 +158,8 @@ module Dnsruby
         lenmsg = [args[:msg].length].pack('n')
         c.send_data(lenmsg)
         c.send_data args[:msg] # , args[:server], args[:port]
-        TheLog.debug"EventMachine : Sent TCP packet to #{args[:server]}:#{args[:port]}" + # from #{args[:src_addr]}:#{args[:src_port]}, timeout=#{args[:timeout]}"
-        ", timeout=#{args[:timeout]}"
+        Dnsruby.log.debug {"EventMachine : Sent TCP packet to #{args[:server]}:#{args[:port]}" + # from #{args[:src_addr]}:#{args[:src_port]}, timeout=#{args[:timeout]}"
+        ", timeout=#{args[:timeout]}"}
       }
       return connection # allows clients to set callback, errback, etc., if desired
     end
@@ -168,7 +169,7 @@ module Dnsruby
         c.timeout_time=Time.now + args[:timeout]
         c.instance_eval {@args = args}
         c.send_datagram args[:msg], args[:server], args[:port]
-        TheLog.debug"EventMachine : Sent datagram to #{args[:server]}:#{args[:port]} from #{args[:src_addr]}:#{args[:src_port]}, timeout=#{args[:timeout]}"
+        Dnsruby.log.debug{"EventMachine : Sent datagram to #{args[:server]}:#{args[:port]} from #{args[:src_addr]}:#{args[:src_port]}, timeout=#{args[:timeout]}"}
       }
       return connection # allows clients to set callback, errback, etc., if desired
     end
@@ -181,23 +182,23 @@ module Dnsruby
         @closing=false
       end
       def receive_data(dgm)
-        TheLog.debug("UDP receive_data called")
+        Dnsruby.log.debug{"UDP receive_data called"}
         process_incoming_message(dgm)
       end
       
       def process_incoming_message(data)
-        TheLog.debug("Processing incoming message, #{data.length} bytes")
+        Dnsruby.log.debug{"Processing incoming message, #{data.length} bytes"}
         ans=nil
         begin
           ans = Message.decode(data)
         rescue Exception => e
-          TheLog.error("Decode error! #{e.class}, #{e}\nfor msg (length=#{data.length}) : #{data}")
+          Dnsruby.log.error{"Decode error! #{e.class}, #{e}\nfor msg (length=#{data.length}) : #{data}"}
           @closing=true
           close_connection
           send_to_client(nil, nil, e)
           return
         end
-        TheLog.debug("#{ans}")
+        Dnsruby.log.debug{"#{ans}"}
         ans.answerfrom=(@args[:server])
         ans.answersize=(data.length)
         exception = ans.header.get_exception
@@ -207,12 +208,12 @@ module Dnsruby
       end
         
       def unbind
-        TheLog.debug("Unbind called")
+        Dnsruby.log.debug{"Unbind called"}
         if (!@closing)
           if (@timeout_time <= Time.now + 1)
             send_timeout
           else
-            TheLog.debug("Sending IOError to client")
+            Dnsruby.log.debug{"Sending IOError to client"}
             send_to_client(nil, nil, IOError.new("Network error"))
           end
         end
@@ -221,7 +222,7 @@ module Dnsruby
         EventMachineInterface.remove_from_outstanding(self)
       end
       def send_timeout
-        TheLog.debug("Sending timeout to client")
+        Dnsruby.log.debug{"Sending timeout to client"}
         send_to_client(nil, nil, ResolvTimeout.new("Query timed out"))
       end
       def send_to_client(msg, bytes, err)
@@ -242,19 +243,19 @@ module Dnsruby
         @answersize = 0
       end
       def receive_data(data)
-        TheLog.debug("TCP receive_data called")
+        Dnsruby.log.debug{"TCP receive_data called"}
         #Buffer up the incoming data until we have a complete packet
         @data << data
         if (@data.length >= 2)
           if (@answersize == 0)
             @answersize = @data[0..1].unpack('n')[0]
-            TheLog.debug("TCP - expecting #{@answersize} bytes")
+            Dnsruby.log.debug{"TCP - expecting #{@answersize} bytes"}
           end
           if (@answersize == @data.length - 2)
-            TheLog.debug("TCP - got all #{@answersize} bytes ")
+            Dnsruby.log.debug{"TCP - got all #{@answersize} bytes "}
             process_incoming_message(@data[2..@data.length])
           else
-            TheLog.debug("TCP - got #{@data.length-2} message bytes")
+            Dnsruby.log.debug{"TCP - got #{@data.length-2} message bytes"}
           end
         end
       end      

data/lib/Dnsruby/message.rb

@@ -411,7 +411,7 @@ module Dnsruby
           rr = msg.get_rr
           if (rr.type == Types.TSIG)
             if (count!=o.header.arcount-1)
-              TheLog.Error("Incoming message has TSIG record before last record")
+              Dnsruby.log.Error("Incoming message has TSIG record before last record")
               raise DecodeError.new("TSIG record present before last record")
             end
             o.tsigstart = start # needed for TSIG verification

data/lib/Dnsruby/name.rb

@@ -46,6 +46,7 @@ module Dnsruby
       when String
 #        arg.gsub!(/\.$/o, "")
         return Name.new(split_escaped(arg), /\.\z/ =~ arg ? true : false)
+#        return Name.new(Label.split(arg), /\.\z/ =~ arg ? true : false)
       when Array
         return Name.new(arg, /\.\z/ =~ ((arg.last.kind_of?String)?arg.last : arg.last.string) ? true : false)
       else        

data/lib/Dnsruby/resource/TKEY.rb

@@ -122,7 +122,7 @@ module Dnsruby
       
       # Create the RR from a standard string
       def from_string(string) #:nodoc: all
-        TheLog.error("Dnsruby::RR::TKEY#from_string called, but no text format defined for TKEY")
+        Dnsruby.log.error("Dnsruby::RR::TKEY#from_string called, but no text format defined for TKEY")
       end
       
       def rdata_to_string     

data/lib/Dnsruby/resource/TSIG.rb

@@ -238,7 +238,7 @@ module Dnsruby
         end
         
 	if ((tsig_rr.name != @name) || (tsig_rr.algorithm.downcase != @algorithm.downcase))
-          TheLog.error("BADKEY failure")
+          Dnsruby.log.error("BADKEY failure")
           response.tsigstate = :Failed
           response.tsigerror = RCode.BADKEY
           return false          
@@ -247,7 +247,7 @@ module Dnsruby
         # Check time_signed (RFC2845, 4.5.2) - only really necessary for server
         if (Time.now.to_i > tsig_rr.time_signed + tsig_rr.fudge  ||
               Time.now.to_i < tsig_rr.time_signed - tsig_rr.fudge)
-          TheLog.error("TSIG failed with BADTIME")
+          Dnsruby.log.error("TSIG failed with BADTIME")
           response.tsigstate = :Failed
           response.tsigerror = RCode.BADTIME
           return false          
@@ -307,14 +307,14 @@ module Dnsruby
         @num_envelopes += 1
         if (!response.tsig)
           if ((@num_envelopes > 1) && (@num_envelopes - @last_signed < 100))
-            TheLog.debug("Receiving intermediate envelope in TSIG TCP session")
+            Dnsruby.log.debug("Receiving intermediate envelope in TSIG TCP session")
             response.tsigstate = :Intermediate
             response.tsigerror = RCode.NOERROR
             @buf = @buf + response_bytes
             return
           else
             response.tsigstate = :Failed
-            TheLog.error("Expecting signed packet")
+            Dnsruby.log.error("Expecting signed packet")
             return false
           end
         end
@@ -323,7 +323,7 @@ module Dnsruby
         # We have a TSIG - process it!
         tsig = response.tsig
         if (@num_envelopes == 1)
-          TheLog.debug("First response in TSIG TCP session - verifying normally")
+          Dnsruby.log.debug("First response in TSIG TCP session - verifying normally")
           # Process it as a standard answer
           ok = verify(@query, response, response_bytes)
           if (ok)
@@ -336,7 +336,7 @@ module Dnsruby
           end
           return ok
         end
-        TheLog.debug("Processing TSIG on TSIG TCP session")
+        Dnsruby.log.debug("Processing TSIG on TSIG TCP session")
 
         if (!verify_common(response))
           return false
@@ -358,7 +358,7 @@ module Dnsruby
         mac = calculate_mac(tsig.algorithm, @buf)
 
         if (mac != tsig.mac)
-          TheLog.error("TSIG Verify error on TSIG TCP session")
+          Dnsruby.log.error("TSIG Verify error on TSIG TCP session")
           response.tsigstate = :Failed
           return false
         end
@@ -525,7 +525,7 @@ module Dnsruby
         else
           raise ArgumentError.new("#{alg.class} not valid type for Dnsruby::RR::TSIG#algorithm=  - use String or Name")
         end
-        TheLog.debug("Using #{@algorithm.to_s} algorithm")
+        Dnsruby.log.debug{"Using #{@algorithm.to_s} algorithm"}
       end
       
       def fudge=(f)

data/lib/Dnsruby/select_thread.rb

@@ -100,7 +100,7 @@ module Dnsruby
     
     def check_select_thread_synchronized
       if (!@@select_thread.alive?)
-        TheLog.debug("Restarting select thread")
+        Dnsruby.log.debug{"Restarting select thread"}
         @@select_thread = Thread.new {
           do_select
         }
@@ -120,7 +120,7 @@ module Dnsruby
       while true do
         send_tick_to_observers
         send_queued_exceptions
-        timeout = tick_time = (Time.now+0.1) - Time.now # We provide a timer service to various Dnsruby classes
+        timeout = tick_time = 0.1 # We provide a timer service to various Dnsruby classes
         sockets=[]
         timeouts=[]
         has_observer = false
@@ -160,7 +160,7 @@ module Dnsruby
         end
         @@mutex.synchronize{
           if (unused_loop_count > 10 && @@query_hash.empty? && @@observers.empty?)
-            TheLog.debug("Stopping select loop")
+            Dnsruby.log.debug{"Stopping select loop"}
             return
           end
         }
@@ -169,7 +169,7 @@ module Dnsruby
     end
     
     def process_error(errors)
-      TheLog.debug("Error! #{errors.inspect}")
+      Dnsruby.log.debug{"Error! #{errors.inspect}"}
       # @todo@ Process errors [can we do this in single socket environment?]
     end
     
@@ -220,7 +220,7 @@ module Dnsruby
           if (res.check_response(msg, bytes, query, client_queue, id, tcp))
             remove_id(id)
             exception = msg.header.get_exception
-            TheLog.debug("Pushing response to client queue")
+            Dnsruby.log.debug{"Pushing response to client queue"}
             client_queue.push([id, msg, exception])
             notify_queue_observers(client_queue, id)
           else
@@ -230,7 +230,7 @@ module Dnsruby
         end
       end
       # If not, then we have an error
-      TheLog.error("Stray packet - " + msg.inspect + "\n from " + socket.inspect)
+      Dnsruby.log.error{"Stray packet - " + msg.inspect + "\n from " + socket.inspect}
     end
     
     def remove_id(id)
@@ -238,10 +238,11 @@ module Dnsruby
       @@mutex.synchronize{
         socket = @@query_hash[id].socket
         @@timeouts.delete(id)
-        @@query_hash.delete(id)      
+        @@query_hash.delete(id)  
+        @@socket_hash.delete(socket)        
         @@sockets.delete(socket) # @TODO@ Not if persistent!
       }
-      TheLog.debug("Closing socket #{socket}")
+      Dnsruby.log.debug{"Closing socket #{socket}"}
       socket.close # @TODO@ Not if persistent!
     end
     
@@ -295,33 +296,33 @@ module Dnsruby
             answersize=(buf.length)
           else
             # recvfrom failed - why?
-            TheLog.error("Error - recvfrom failed from #{socket}")
+            Dnsruby.log.error{"Error - recvfrom failed from #{socket}"}
             handle_recvfrom_failure(socket)          
             return
           end        
         end
       rescue Exception => e
-        TheLog.error("Error - recvfrom failed from #{socket}, exception : #{e}")
+        Dnsruby.log.error{"Error - recvfrom failed from #{socket}, exception : #{e}"}
         handle_recvfrom_failure(socket)          
         return
       end
-      TheLog.debug(";; answer from #{answerfrom} : #{answersize} bytes\n")
+      Dnsruby.log.debug{";; answer from #{answerfrom} : #{answersize} bytes\n"}
       
       begin
         ans = Message.decode(buf)
       rescue Exception => e
-        TheLog.error("Decode error! #{e.class}, #{e}\nfor msg (length=#{buf.length}) : #{buf}")
+        Dnsruby.log.error{"Decode error! #{e.class}, #{e}\nfor msg (length=#{buf.length}) : #{buf}"}
         client_id=get_client_id_from_answerfrom(socket, answerip, answerport)
         if (client_id != nil) 
           send_exception_to_client(e, socket, client_id)
         else
-          TheLog.error("Decode error from #{answerfrom} but can't determine packet id")
+          Dnsruby.log.error{"Decode error from #{answerfrom} but can't determine packet id"}
         end
         return
       end
       
       if (ans!= nil)
-        TheLog.debug("#{ans}")
+        Dnsruby.log.debug{"#{ans}"}
         ans.answerfrom=(answerfrom)
         ans.answersize=(answersize)
       end
@@ -342,7 +343,7 @@ module Dnsruby
         }
         send_exception_to_client(OtherResolvError.new("recvfrom failed from #{answerfrom}"), socket, ids_for_socket[0])
       else
-        TheLog.fatal("Recvfrom failed from #{socket}, no way to tell query id")
+        Dnsruby.log.fatal{"Recvfrom failed from #{socket}, no way to tell query id"}
       end
     end
     
@@ -413,9 +414,10 @@ module Dnsruby
     def remove_observer(client_queue, observer)
       @@mutex.synchronize {
         if (@@observers[client_queue]==observer)
-          @@observers.delete(observer)
+#          @@observers.delete(observer)
+          @@observers.delete(client_queue)
         else
-          TheLog.error("remove_observer called with wrong observer for queue")
+          Dnsruby.log.error{"remove_observer called with wrong observer for queue"}
           raise ArgumentError.new("remove_observer called with wrong observer for queue")
         end
         if (!@@observers.values.include?observer)

data/lib/Dnsruby/zone_transfer.rb

@@ -106,7 +106,7 @@ module Dnsruby
               if (@transfer_type == Types.IXFR &&
                     rcode == RCode.NOTIMP)
                 # IXFR didn't work - let's try AXFR
-                TheLog.debug("IXFR DID NOT WORK (rcode = NOTIMP) - TRYING AXFR!!")
+                Dnsruby.log.debug("IXFR DID NOT WORK (rcode = NOTIMP) - TRYING AXFR!!")
                 @state = :InitialSoa
                 @transfer_type=Types.AXFR
                 # Send an initial AXFR query
@@ -122,7 +122,7 @@ module Dnsruby
             end
             
             if (response.header.ancount == 0 && @transfer_type == Types.IXFR) 
-              TheLog.debug("IXFR DID NOT WORK (ancount = 0) - TRYING AXFR!!")
+              Dnsruby.log.debug("IXFR DID NOT WORK (ancount = 0) - TRYING AXFR!!")
               # IXFR didn't work - let's try AXFR
               @transfer_type=Types.AXFR
               # Send an initial AXFR query
@@ -213,7 +213,7 @@ module Dnsruby
         # to recognize the end of an IXFR.
         @end_serial = rec.serial
         if (@transfer_type == Types.IXFR && @end_serial <= @serial)
-          TheLog.debug("zone up to date")
+          Dnsruby.log.debug("zone up to date")
           @state = :End
         else
           @state = :FirstData
@@ -223,12 +223,12 @@ module Dnsruby
         # If it begins with 2 SOAs, it's an IXFR.
         if (@transfer_type == Types.IXFR && type == Types.SOA &&
               rec.serial == @serial)
-          TheLog.debug("IXFR response - using IXFR")
+          Dnsruby.log.debug("IXFR response - using IXFR")
           @rtype = Types.IXFR
           @ixfr = []
           @state = :Ixfr_DelSoa
         else
-          TheLog.debug("AXFR response - using AXFR")
+          Dnsruby.log.debug("AXFR response - using AXFR")
           @rtype = Types.AXFR
           @axfr = []
           @axfr << @initialsoa
@@ -322,7 +322,7 @@ module Dnsruby
       msg = Message.decode(buf)
       if (@tsig)
           if !@tsig.verify_envelope(msg, buf)
-            TheLog.error("Bad signature on zone transfer - closing connection")
+            Dnsruby.log.error("Bad signature on zone transfer - closing connection")
             raise ResolvError.new("Bad signature on zone transfer")
           end      
       end

data/lib/dnsruby.rb

@@ -13,11 +13,11 @@
 #See the License for the specific language governing permissions and 
 #limitations under the License.
 #++
-require 'Dnsruby/TheLog'
 require 'Dnsruby/code_mapper'
 require 'Dnsruby/ipv4'
 require 'Dnsruby/ipv6'
 require 'timeout'
+require 'Dnsruby/TheLog'
 #= Dnsruby library
 #Dnsruby is a thread-aware DNS stub resolver library written in Ruby.
 #
@@ -90,6 +90,15 @@ require 'timeout'
 #* /etc/nsswitch.conf is not supported.
 #* IPv6 is not supported.
 module Dnsruby
+  
+      @@logger = Logger.new(STDOUT)
+      @@logger.level = Logger::FATAL
+      #Get the log for Dnsruby
+      #Use this to set the log level
+      #e.g. Dnsruby.log.level = Logger::INFO
+      def Dnsruby.log
+        @@logger
+      end
   class OpCode < CodeMapper
     Query = 0        # RFC 1035
     IQuery = 1        # RFC 1035

data/test/tc_dns.rb

@@ -22,6 +22,10 @@ class TestDNS < Test::Unit::TestCase
     Dnsruby::Config.reset
   end
   
+  def test_ipv4_address
+    Dnsruby::DNS.open { |dns| dns.getnames(Dnsruby::IPv4.create("221.186.184.68")) }
+  end
+  
   def test_resolv_rb_api
     DNS.open {|dns|
       dns.getresources("www.ruby-lang.org", Types.A).each  {|r| assert_equal(r.address.to_s, "221.186.184.68")}
@@ -74,7 +78,7 @@ class TestDNS < Test::Unit::TestCase
     #
     # Check that new() is vetting things properly.
     #
-    Dnsruby::TheLog.level=Logger::FATAL
+    Dnsruby.log.level=Logger::FATAL
     [:nameserver].each do |test|
       [{}, 'string',1,'\1',nil].each do |input|
         res=nil

data/test/tc_event_machine_deferrable.rb

@@ -8,7 +8,7 @@ require 'dnsruby'
 class EventMachineTestDeferrable < Test::Unit::TestCase
   Dnsruby::Resolver.use_eventmachine(true)
   def setup
-#    Dnsruby::TheLog.level=Logger::DEBUG
+#    Dnsruby.log.level=Logger::DEBUG
     Dnsruby::Resolver.use_eventmachine(true)
     Dnsruby::Resolver.start_eventmachine_loop(true)
   end

data/test/tc_event_machine_res.rb

@@ -11,7 +11,7 @@ class EventMachineTestResolver < Test::Unit::TestCase
   Thread::abort_on_exception = true
   def setup
     Dnsruby::Config.reset
-    #    Dnsruby::TheLog.level=Logger::DEBUG
+    #    Dnsruby.log.level=Logger::DEBUG
     Dnsruby::Resolver.use_eventmachine(true)
     Dnsruby::Resolver.start_eventmachine_loop(true)
   end

data/test/tc_event_machine_single_res.rb

@@ -8,7 +8,7 @@ require 'dnsruby'
 class EventMachineTestSingleResolver < Test::Unit::TestCase
   Dnsruby::Resolver.use_eventmachine(true)
   def setup
-#    Dnsruby::TheLog.level=Logger::DEBUG
+#    Dnsruby.log.level=Logger::DEBUG
     Dnsruby::Resolver.use_eventmachine(true)
     Dnsruby::Resolver.start_eventmachine_loop(true)
     sleep(0.01)

data/test/tc_event_machine_soak.rb

@@ -10,7 +10,7 @@ end
 
 class TestEventMachineSoak < Test::Unit::TestCase
   def setup
-    #    Dnsruby::TheLog.level=Logger::DEBUG
+    #    Dnsruby.log.level=Logger::DEBUG
     Dnsruby::Resolver.use_eventmachine(true)
   end
   def teardown
@@ -23,7 +23,7 @@ class TestEventMachineSoak < Test::Unit::TestCase
     sleep(0.1)
     @@dfs = {}
     @@num_sent = 0
-    #Dnsruby::TheLog.level=Logger::DEBUG
+    #Dnsruby.log.level=Logger::DEBUG
     res = Dnsruby::SingleResolver.new
     Dnsruby::Resolver.use_eventmachine
     Dnsruby::Resolver.start_eventmachine_loop(false)
@@ -39,7 +39,7 @@ class TestEventMachineSoak < Test::Unit::TestCase
   end
   
   def test_sequential
-    #Dnsruby::TheLog.level=Logger::DEBUG
+    #Dnsruby.log.level=Logger::DEBUG
     Dnsruby::Resolver.use_eventmachine(true)
     Dnsruby::Resolver.start_eventmachine_loop(true)
     res = Dnsruby::SingleResolver.new
@@ -62,7 +62,7 @@ class TestEventMachineSoak < Test::Unit::TestCase
     sleep(0.1)
     @@dfs = {}
     @@num_sent = 0
-    #Dnsruby::TheLog.level=Logger::DEBUG
+    #Dnsruby.log.level=Logger::DEBUG
     res = Dnsruby::Resolver.new
     Dnsruby::Resolver.use_eventmachine
     Dnsruby::Resolver.start_eventmachine_loop(false)

data/test/tc_res_opt.rb

@@ -47,7 +47,7 @@ class TestResOpt < Test::Unit::TestCase
   end
   
   def test_no_file
-    Dnsruby::TheLog.level=Logger::FATAL
+    Dnsruby.log.level=Logger::FATAL
     res=nil
     begin
       res = DNS.new('nosuch.txt')
@@ -59,7 +59,7 @@ class TestResOpt < Test::Unit::TestCase
       assert_equal(["0.0.0.0"], res.nameserver,"No nameservers should be set for #{test} = #{input}")
     rescue Exception
     end
-#    Dnsruby::TheLog.level=Logger::ERROR
+#    Dnsruby.log.level=Logger::ERROR
   end
   
   def test_config_hash_singleresolver
@@ -141,7 +141,7 @@ class TestResOpt < Test::Unit::TestCase
   
   def test_bad_config
     res=nil
-    Dnsruby::TheLog.level=Logger::FATAL
+    Dnsruby.log.level=Logger::FATAL
     
     bad_input = {
       :tsig_rr        => 'set',
@@ -181,7 +181,7 @@ class TestResOpt < Test::Unit::TestCase
         rescue Exception
         end
       end
-#      Dnsruby::TheLog.level=Logger::ERROR
+#      Dnsruby.log.level=Logger::ERROR
     end
   end
 end

data/test/tc_single_resolver.rb

@@ -19,7 +19,7 @@ require 'dnsruby'
 include Dnsruby
 class TestSingleResolver < Test::Unit::TestCase
   Thread::abort_on_exception = true
-  #  Dnsruby::TheLog.level=Logger::DEBUG
+  #  Dnsruby.log.level=Logger::DEBUG
   
   def setup
     Dnsruby::Config.reset
@@ -141,11 +141,6 @@ class TestSingleResolver < Test::Unit::TestCase
   #    assert(Dnsruby::SelectThread.instance.select_thread_alive?)
   #  end
   
-  def test_persistent_socket
-    #@TODO@ Really need a test server for this one!
-    p "Implement persistent sockets!"
-  end
-  
   def test_res_config
     res = Dnsruby::SingleResolver.new
     

data/test/tc_soak_base.rb

@@ -69,7 +69,7 @@ class TestSoakBase # < Test::Unit::TestCase
           timed_out+=1
           #        p "Number #{i} timed out!"
         elsif (ret.class != Message)
-          TheLog.debug("tc_single_resolver : Query #{i} ERROR RETURNED : #{error.class}, #{error}")
+          Dnsruby.log.debug("tc_single_resolver : Query #{i} ERROR RETURNED : #{error.class}, #{error}")
         end
       end
     }
@@ -120,7 +120,7 @@ class TestSoakBase # < Test::Unit::TestCase
           #        p "Number #{i} timed out!"
         elsif (ret.class != Message)
           error_count+=1
-          TheLog.error("tc_single_resolver : Query #{i} ERROR RETURNED : #{error.class}, #{error}")
+          Dnsruby.log.error("tc_single_resolver : Query #{i} ERROR RETURNED : #{error.class}, #{error}")
         end
       end
     }

data/test/tc_tsig.rb

@@ -32,7 +32,7 @@ class TestTSig < Test::Unit::TestCase
     begin
       Dnsruby::Resolver::use_eventmachine(true)
     rescue RuntimeError
-      Dnsruby::TheLog.error("EventMachine not installed - not running tsig EM tests")
+      Dnsruby.log.error("EventMachine not installed - not running tsig EM tests")
       return 
     end
     run_test_client_signs
@@ -67,7 +67,7 @@ class TestTSig < Test::Unit::TestCase
     res.udp_size=512 # Or else we needed to add OPT record already
     res.dnssec=false
     res.recurse=false
-    res.query_timeout = 10
+    res.query_timeout = 20
     response = res.send_message(update)
     
     assert_equal( Dnsruby::RCode.NOERROR, response.header.rcode)
@@ -105,7 +105,7 @@ class TestTSig < Test::Unit::TestCase
   
   def run_test_resolver_signs
     res = Dnsruby::Resolver.new("ns0.validation-test-servers.nominet.org.uk")
-    res.query_timeout=10
+    res.query_timeout=20
     res.tsig=KEY_NAME, KEY
     
     update = Dnsruby::Update.new("validation-test-servers.nominet.org.uk")

data/test/ts_offline.rb

@@ -15,7 +15,7 @@
 #++
 require 'rubygems'
 require 'dnsruby'
-Dnsruby::TheLog.level = Logger::FATAL
+Dnsruby.log.level = Logger::FATAL
 require "test/unit"
 require "test/tc_header.rb"
 require "test/tc_name.rb"

data/test/ts_online.rb

@@ -15,7 +15,7 @@
 #++
 require 'rubygems'
 require 'dnsruby'
-Dnsruby::TheLog.level = Logger::FATAL
+Dnsruby.log.level = Logger::FATAL
 require "test/unit"
 # Disable these tests if we're not online
 require 'socket'