astro-em-dns 0.0.1 → 0.0.2

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
-:patch: 1
 :major: 0
 :minor: 0
+:patch: 2

data/examples/lookup_many.rb

@@ -0,0 +1,55 @@
+#!/usr/bin/env ruby
+
+require 'uri'
+require 'eventmachine'
+$: << File.dirname(__FILE__) + '/../lib'
+require 'em/dns_cache'
+
+if ARGV.size == 0
+  puts "Usage: #{$0} <url-files>"
+  exit
+end
+
+
+hosts = []
+ARGV.each do |fn|
+  IO::readlines(fn).each do |line|
+      line.chomp!
+      line.split(/\s+/).each do |url|
+        uri = URI::parse(url)
+        hosts << uri.host
+    end
+  end
+end
+puts "Will resolve #{hosts.size} hosts"
+
+EM::DnsCache.add_nameservers_from_file
+EM::DnsCache.verbose
+
+EM.run {
+  pending = 0
+  hosts.each do |host|
+    df = EM::DnsCache.resolve(host)
+    df.callback { |*a|
+      if a.size == 1
+        if a.kind_of?(Array)
+          # Good!
+        else
+          p host => a[0]
+        end
+      else
+        p host => {:args => a}
+      end
+      pending -= 1
+      EM.stop if pending < 1
+    }
+    df.errback { |*a|
+      puts "Cannot resolve #{host}: #{a.inspect}"
+      pending -= 1
+      EM.stop if pending < 1
+    }
+    pending += 1
+    puts "#{pending} pending"
+  end
+  puts "Started all: #{pending} pending"
+}

data/lib/em/dns_cache.rb

@@ -35,6 +35,9 @@ module EventMachine
     @mx_cache = Cache.new
     @nameservers = []
     @message_ix = 0
+    MAX_WAITING = 20
+    @waiting = 0
+    @pending = []
 
     def self.add_nameserver ns
       @nameservers << ns unless @nameservers.include?(ns)
@@ -73,6 +76,8 @@ module EventMachine
     #
     def self.resolve domain
       if d = @a_cache.retrieve(domain)
+        puts "Cache hit for #{domain}" if @verbose
+        look_pending
         d
       else
 =begin
@@ -87,40 +92,79 @@ module EventMachine
         end
       else
 =end
-        STDOUT.puts "Fulfilling #{domain} from network" if @verbose
-        d = EM::DefaultDeferrable.new
-        d.timeout(5)
-        @a_cache.add domain, d, 300 # Hard-code a 5 minute expiration
-        #@a_cache[domain] = [Time.now+120, d] # Hard code a 120-second expiration.
+        if @waiting >= MAX_WAITING
+          puts "Postponing #{domain} because already waiting for #{@waiting} queries" if @verbose
+          d = EM::DefaultDeferrable.new
+          @pending << lambda {
+            d_inner = resolve domain
+            d_inner.callback &d.method(:succeed)
+            d_inner.errback &d.method(:fail)
+          }
+          puts "#{@pending.size} pending requests now" if @verbose
+          d
+        else
+          d = resolve_do domain
+          @waiting += 1
+          STDOUT.puts "Now waiting for #{@waiting}" if @verbose
+          on_one_done = lambda {
+            @waiting -= 1
+            look_pending
+          }
+          d.callback &on_one_done
+          d.errback &on_one_done
+          d
+        end
+      end
+    end
 
-        lazy_initialize
-        m = Resolv::DNS::Message.new
-        m.rd = 1
-        m.add_question domain, Resolv::DNS::Resource::IN::A
-        m = m.encode
-        @nameservers.each {|ns|
-          @message_ix = (@message_ix + 1) % 60000
-          Request.new d, @message_ix
-          msg = m.dup
-          msg[0,2] = [@message_ix].pack("n")
-          @u.send_datagram msg, ns, 53
-        }
+    def self.look_pending
+      EM.next_tick {
+        while @waiting < MAX_WAITING && !@pending.empty?
+          pending1 = @pending.shift
+          pending1.call
+          puts "#{@pending.size} pending requests now" if @verbose
+        end
+      }
+    end
 
-        d.callback {|resp|
-          r = []
-          resp.each_answer {|name,ttl,data|
-            r << data.address.to_s if data.kind_of?(Resolv::DNS::Resource::IN::A)
-          }
+    def self.resolve_do domain
+      STDOUT.puts "Fulfilling #{domain} from network" if @verbose
+      d = EM::DefaultDeferrable.new
+      d.timeout(5)
+      d.callback { d.cancel_timeout }
+      d.errback { d.cancel_timeout }
+      @a_cache.add domain, d, 300 # Hard-code a 5 minute expiration
+      #@a_cache[domain] = [Time.now+120, d] # Hard code a 120-second expiration.
+
+      lazy_initialize
+      m = Resolv::DNS::Message.new
+      m.rd = 1
+      m.add_question domain, Resolv::DNS::Resource::IN::A
+      m = m.encode
+      d_inner = EM::DefaultDeferrable.new
+      @nameservers.each {|ns|
+        @message_ix = (@message_ix + 1) % 60000
+        Request.new d_inner, @message_ix
+        msg = m.dup
+        msg[0,2] = [@message_ix].pack("n")
+        @u.send_datagram msg, ns, 53
+      }
 
-          # Freeze the array since we'll be keeping it in cache and passing it
-          # around to multiple users. And alternative would have been to dup it.
-          r.freeze
-          d.succeed r
+      d_inner.callback {|resp|
+        r = []
+        resp.each_answer {|name,ttl,data|
+          r << data.address.to_s if data.kind_of?(Resolv::DNS::Resource::IN::A)
         }
 
+        # Freeze the array since we'll be keeping it in cache and passing it
+        # around to multiple users. And alternative would have been to dup it.
+        r.freeze
+        d.succeed r
+      }
+      d_inner.errback &d.method(:fail)
 
-        d
-      end
+
+      d
     end
 
 
@@ -275,8 +319,8 @@ module EventMachine
         @@outstanding[@msgid] = self
 
         self.timeout(10)
-        self.errback { @@outstanding.delete(@msgid) }
-        self.callback {|resp| @result.succeed resp }
+        self.errback { self.cancel_timeout; @@outstanding.delete(@msgid); @result.fail }
+        self.callback {|resp| self.cancel_timeout; @result.succeed resp }
       end
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: astro-em-dns
 version: !ruby/object:Gem::Version 
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors: 
 - Aman Gupta
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-17 00:00:00 -07:00
+date: 2009-05-19 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -36,7 +36,7 @@ files:
 - VERSION.yml
 - lib/em/dns_cache.rb
 - test/test_basic.rb
-has_rdoc: true
+has_rdoc: false
 homepage: http://github.com/astro/em-dns
 post_install_message: 
 rdoc_options: 
@@ -64,3 +64,4 @@ specification_version: 3
 summary: Resolve domain names from EventMachine natively
 test_files: 
 - test/test_basic.rb
+- examples/lookup_many.rb