emptyd 0.0.4 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ff9c050c494402921ba0f7813e46c1d249cdd4bf
-  data.tar.gz: 54bd7b74632cb1c27956a3233cb773a6ec6edb54
+  metadata.gz: 54c1986a43737d5677bd3be8f54c70297d115ba5
+  data.tar.gz: 703dc34c62c07005a9e3e4d8e491b0d1e1d2d8a1
 SHA512:
-  metadata.gz: 29d35c215c48355f0afb01459b069af9d4f99d06c9bdc37903fa99171e1b0ae60bdeae631fc78f989b10801221c0cc8cea11c5f545d73af1fffcea62f6807214
-  data.tar.gz: 2e15bf30ff34701df89e85a3c1fab820b751a6897d2871069b91ee3e406e134120ae587d593d1ea607696a39d30fe5cd56efc0c59fe414ad11c6e0f960940f38
+  metadata.gz: 157e1c2f2674399157fa02ab38fdc6d584df852241b85b0b024636345bd5301275d4f8ab61bc07acaf24294a7cdccff205841fa6fc69454be2e1eb193c73d33d
+  data.tar.gz: c89ef07273792b1b5594501f0d29032dbbf100c19e092c2ce5d5c1b0584226b2049e17edad5223271760dbd2cb0f187d88cc4f41343311aa91c6282e0e355ee8

data/bin/emptyd

@@ -48,6 +48,9 @@ class MyHttpServer < EM::Connection
           response.content = JSON.dump([nil,:dead,nil])
         else
           return session.queue.pop do |data|
+            if data[-1].kind_of? String
+              data[-1].force_encoding Encoding::UTF_8
+            end
             response.content = JSON.dump(data)
             response.send_response
           end
@@ -90,7 +93,7 @@ CONFIG = {
 %w{.emptyd.conf .empty.conf}.map{|name| File.expand_path("~/#{name}")}.each do |name|
   next unless File.exist? name
   File.open(name) do |file|
-    CONFIG.merge!(JSON.parse(file, :symbolize_names => true)) do |k, x, y| 
+    CONFIG.merge!(JSON.parse(file.read, :symbolize_names => true)) do |k, x, y| 
       x.respond_to?(:merge) ? x.merge(y) : y
     end
   end

data/emptyd.gemspec

@@ -25,4 +25,5 @@ Gem::Specification.new do |spec|
   spec.add_dependency "em-udns"
   spec.add_dependency "em-ssh"
   spec.add_dependency "eventmachine_httpserver"
+  spec.add_dependency "json"
 end

data/lib/emptyd/version.rb

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

data/lib/emptyd.rb

@@ -12,7 +12,7 @@ module Emptyd
   class Connection
     attr_reader :key, :updated_at, :failed_at, :error
     EXPIRE_INTERVAL = 600 # 10min
-    MAX_CONNECTIONS = 30
+    MAX_CONNECTIONS = 100
     HAPPY_RATIO = 0.5
     @@connections = {}
     @@count = {}
@@ -130,31 +130,33 @@ module Emptyd
         end
       end
 
+      resolver = nil
+
       resfail = proc do |err|
         @error = err
+        @logger.error "DNS 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 = @@dns.submit_A @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 = @@dns.submit_AAAA @host
             query.callback do |result|
               @ip = result.sample
               starter[]
             end
             query.errback { |err| resfail[err] }
           else
-            resfail[]
+            resfail[err]
           end
         end
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: emptyd
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.6
 platform: ruby
 authors:
 - kmeaw
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-19 00:00:00.000000000 Z
+date: 2014-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -94,6 +94,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: json
+  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'
 description: An HTTP interface to run a single command on a cluster.
 email:
 - kmeaw@larkit.ru