amiral 0.1.4 → 0.1.5

data/lib/amiral/version.rb

@@ -1,3 +1,3 @@
 module Amiral
-  VERSION = '0.1.4'
+  VERSION = '0.1.5'
 end

data/lib/amiral.rb

@@ -254,11 +254,9 @@ module Amiral
 
     def initialize settings
       @settings = {
+        :prefix => "amiral:",
         :redis_in => Redis.new,
         :redis_out => Redis.new,
-        :exchange => "req",
-        :queue_ack => "ack",
-        :queue_response => "res",
         :keytype => :dss,
         :hostname => hostname,
         :loglevel => Logger::INFO,
@@ -291,8 +289,8 @@ module Amiral
     end
 
     def listen
-      exchange = @settings[:exchange]
-      @redis_in.subscribe exchange do |on|
+      prefix = @settings[:prefix]
+      @redis_in.subscribe "#{prefix}req" do |on|
         
         on.message do |x, payload|
 
@@ -334,16 +332,19 @@ module Amiral
     end
     
     def send_ack response
-      send_payload @settings[:queue_ack], response
+      send_payload "ack", response
     end
 
     def send_response response
-      send_payload @settings[:queue_response], response
+      send_payload "res", response
     end
 
-    def send_payload q, response
+    def send_payload type, response
+      puts "response: #{response}"
+      uuid = response[:in_reply_to]
       response[:hostname] = @settings[:hostname]
-      @redis_out.lpush q, serialize(response)
+      prefix = @settings[:prefix]
+      @redis_out.publish "#{prefix}#{type}:#{uuid}", serialize(response)
     end
   end
 
@@ -353,9 +354,7 @@ module Amiral
     def initialize settings
       @settings = {
         :redis => Redis.new,
-        :exchange => "req",
-        :queue_ack => "ack",
-        :queue_response => "res",
+        :prefix => "amiral:",
         :ack_timeout => 2,
         :response_timeout => 5,
         :match_spec => {:all => true},
@@ -391,43 +390,13 @@ module Amiral
       @redis.publish @settings[:exchange], serialize(request)
 
       # pop items for 2 seconds
-      acks = []
+      acks = {}
+      resps = {}
       puts "accepting acknowledgements for #{@settings[:ack_timeout]} seconds"
       limit = timestamp + @settings[:ack_timeout]
 
-      while timestamp < limit do
-        t = timestamp
-        t = (limit - t == 0) ? 1 : (limit - t)
-        (q, data) = @redis.brpop(@settings[:queue_ack], t) 
-        if data
-          ack = deserialize data
-          acks << ack if ack['in_reply_to'] == uuid
-        end
-      end
-
-      pos_acks = acks.keep_if do |a|
-        a['status'] == 'start'
-      end
-
-      remaining = pos_acks.length
-      puts "got #{remaining}/#{acks.length} positive acknowledgements"
-      
-      # wait for responses now
+      ## XXX: broken for now
       @responses = []
-      limit = timestamp + @settings[:response_timeout]
-      while timestamp < limit && remaining > 0 do
-        t = timestamp
-        t = (limit - t == 0) ? 1 : (limit - t)
-        (q, data) = @redis.brpop(@settings[:queue_response], t)
-
-        if data
-          res = deserialize data
-          if res['in_reply_to'] == uuid
-            @responses << res
-            remaining -= 1
-          end
-        end
-      end
 
       puts "got #{@responses.length}/#{pos_acks.length} responses"
       @responses

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: amiral
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-13 00:00:00.000000000 Z
+date: 2012-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis