emptyd 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 32566e139b257acf527f779fd480c9fec01e4960
-  data.tar.gz: 81f6f5a86813270382e4c56a9ccc1294a53c377c
+  metadata.gz: ff9c050c494402921ba0f7813e46c1d249cdd4bf
+  data.tar.gz: 54bd7b74632cb1c27956a3233cb773a6ec6edb54
 SHA512:
-  metadata.gz: cbcd1d4083dfa2f247319607760d5f7fe7293e742319ee2bdd8464d4e614d5567032a4146bf9cb179544b481d9c5191fd5f5b45ae759152259d725489b148acf
-  data.tar.gz: 0e9b62a83582dc85de24904cfe22fe51b1843b477a2a875bac2227b03fbedaf28941d3cce298211c810959d331f4e8e19e64c1997f7dd96554d00186b56d66b0
+  metadata.gz: 29d35c215c48355f0afb01459b069af9d4f99d06c9bdc37903fa99171e1b0ae60bdeae631fc78f989b10801221c0cc8cea11c5f545d73af1fffcea62f6807214
+  data.tar.gz: 2e15bf30ff34701df89e85a3c1fab820b751a6897d2871069b91ee3e406e134120ae587d593d1ea607696a39d30fe5cd56efc0c59fe414ad11c6e0f960940f38

data/emptyd.gemspec

@@ -21,6 +21,8 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
 
+  spec.add_dependency "eventmachine-le"
+  spec.add_dependency "em-udns"
   spec.add_dependency "em-ssh"
   spec.add_dependency "eventmachine_httpserver"
 end

data/lib/emptyd/version.rb

@@ -1,3 +1,3 @@
 module Emptyd
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/lib/emptyd.rb

@@ -1,10 +1,12 @@
 # vim: ai:ts=2:sw=2:et:syntax=ruby
 require "emptyd/version"
 
+require 'eventmachine-le'
 require 'fiber'
 require 'em-ssh'
 require 'securerandom'
 require 'json'
+require 'em-udns'
 
 module Emptyd
   class Connection
@@ -14,6 +16,7 @@ module Emptyd
     HAPPY_RATIO = 0.5
     @@connections = {}
     @@count = {}
+    @@dns = nil
 
     def self.[](key, logger)
       @@connections[key] or Connection.new(key, logger)
@@ -55,6 +58,11 @@ module Emptyd
       return if @conn or @connecting
       @connecting = true
 
+      unless @@dns
+        @@dns = EM::Udns::Resolver.new
+        EM::Udns.run @@dns
+      end
+
       pressure = proc do
         if @@count.size >= MAX_CONNECTIONS # pressure
           c = @@count.select{|k,c| c.free?}.values.sample
@@ -85,7 +93,7 @@ module Emptyd
             @logger.debug "Created new conn: #{key}, quota = #{@@count.size}"
             options = { :user_known_hosts_file => [] }
             options[:password] = $PASSWORD if $PASSWORD
-            EM::Ssh.start(@host, @user, options) do |conn|
+            EM::Ssh.start(@ip, @user, options) do |conn|
               conn.errback { |err| errback err }
               conn.on(:closed) { errback "closed" }
               conn.callback do |ssh|
@@ -122,7 +130,36 @@ module Emptyd
         end
       end
 
-      EM.next_tick starter
+      resfail = proc do |err|
+        @error = err
+        @failed_at = Time.now
+        EM::Timer.new(rand(1..10)) do
+          @start_timer.cancel
+          EM.next_tick resolver
+        end
+      end
+
+      resolver = proc do
+        query = @@dns.submit_AAAA @host
+        query.callback do |result|
+          @ip = result.sample
+          starter[]
+        end
+        query.errback do |err|
+          if err == :dns_error_nodata
+            query = @@dns.submit_A @host
+            query.callback do |result|
+              @ip = result.sample
+              starter[]
+            end
+            query.errback { |err| resfail[err] }
+          else
+            resfail[]
+          end
+        end
+      end
+
+      EM.next_tick resolver
     end
 
     def errback err

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: emptyd
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - kmeaw
@@ -38,6 +38,34 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: eventmachine-le
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: em-udns
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: em-ssh
   requirement: !ruby/object:Gem::Requirement