combi 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f32c087a7be58753b98c2453f2b30051eaf5abf5
-  data.tar.gz: 0204a9e540356da36488b94166bc7b479f49f29c
+  metadata.gz: fb9c96c293e468a51e0e8df468cd80351c8527f1
+  data.tar.gz: 6dae3c02ff950edb7f344023b6d3d1c474b18984
 SHA512:
-  metadata.gz: a7b26b16b375706f08da91f6e3fbdb3fa71423e2e3c9f1081a3f03ff65d1a1c1d9aa8ec1497311089f80fc2c57f61a1e72b741d8d59f0101b7755f5018276a13
-  data.tar.gz: 3e1e5784274ab360b7b165901244da15bdb7df3dfc2d3530e6bead4308c6c42250fe38e170f4710d6c1ccf0090177db2aa83d27f9dbbfce392b6f5c9fc18c193
+  metadata.gz: 07a365af34ac3944d4b4233ce02c695cd81b2c3feeda634bb8d20708e560ef941ab8e5e40d1a0d6d62b278ac87e27471b111f13e79e7e2946b10eeb199db19fc
+  data.tar.gz: 99931424936890d9202d184d059266190e419ed7baa10874280a0ccc38920eae919625cdcca1812dc13e72e7b7161afd4fbf4f8c59b55c44a3ee2d37f62368c3

data/lib/combi/buses/bus.rb

@@ -1,4 +1,5 @@
 require "combi/service"
+require_relative 'correlation'
 require 'yajl'
 require 'yajl/json_gem' # for object.to_json, JSON.parse, etc...
 
@@ -7,7 +8,6 @@ module Combi
     attr_reader :services
 
     RPC_DEFAULT_TIMEOUT = 1
-    RPC_MAX_POLLS = 10
 
     def initialize(options)
       @options = options
@@ -57,7 +57,7 @@ module Combi
 
     def log(message)
       return unless @debug_mode ||= ENV['DEBUG'] == 'true'
-      puts "#{object_id} #{self.class.name} #{message}"
+      puts "#{Time.now.to_f} #{self.class.name} #{message}"
     end
 
     protected

data/lib/combi/buses/correlation.rb

@@ -0,0 +1,7 @@
+module Combi
+  class Correlation
+    def self.generate
+      "#{Thread.current.object_id}_#{rand(10_000_000)}"
+    end
+  end
+end

data/lib/combi/buses/http.rb

@@ -71,7 +71,7 @@ module Combi
     def request(name, kind, message, options = {})
       options[:timeout] ||= RPC_DEFAULT_TIMEOUT
 
-      correlation_id = rand(10_000_000).to_s
+      correlation_id = Combi::Correlation.generate
       waiter = EventedWaiter.wait_for(correlation_id, @response_store, options[:timeout])
       url = "#{@options[:remote_api]}#{name}/#{kind}"
       request_async = EventMachine::HttpRequest.new(url, connection_timeout: options[:timeout]).post(body: message.to_json)

data/lib/combi/buses/queue.rb

@@ -46,9 +46,10 @@ module Combi
     end
 
     def request(name, kind, message, options = {})
+      log "Preparing request: #{name}.#{kind} #{message.inspect}\t|| #{options.inspect}"
       options[:timeout] ||= RPC_DEFAULT_TIMEOUT
       options[:routing_key] = name.to_s
-      correlation_id = rand(10_000_000).to_s
+      correlation_id = Combi::Correlation.generate
       options[:correlation_id] = correlation_id
       waiter = EventedWaiter.wait_for(correlation_id, @response_store, options[:timeout])
       queue_service.ready do

data/lib/combi/buses/web_socket.rb

@@ -212,7 +212,7 @@ module Combi
         kind: kind,
         payload: message
       }
-      correlation_id = rand(10_000_000).to_s
+      correlation_id = Combi::Correlation.generate
       msg[:correlation_id] = correlation_id
       waiter = EventedWaiter.wait_for(correlation_id, @response_store, options[:timeout])
       @ready.callback do |r|

data/lib/combi/helpers.rb

@@ -4,14 +4,15 @@ module Combi
 
   def self.wait_for(defer, options = {}, &block)
     options[:timeout] ||= 2
-    poll_time = options[:timeout] / 10
     resolved = false
+    waiter_thread = Thread.current
     defer.callback { |response|
       resolved = true
       block.call response
+      waiter_thread.wakeup
     }
     Timeout::timeout(options[:timeout]) do
-      sleep poll_time while !resolved
+      Thread.stop
     end
   end
 

data/lib/combi/queue_service.rb

@@ -4,9 +4,6 @@ require 'amqp/utilities/event_loop_helper'
 module Combi
   class QueueService
 
-    RPC_DEFAULT_TIMEOUT = 1
-    RPC_WAIT_PERIOD = 0.01
-
     attr_accessor :rpc_callback
 
     def initialize(config, options)
@@ -22,7 +19,7 @@ module Combi
 
     def log(message)
       return unless @debug_mode ||= ENV['DEBUG'] == 'true'
-      puts "#{object_id} #{self.class.name} #{message}"
+      puts "#{Time.now.to_f} #{self.class.name} #{message}"
     end
 
     def start
@@ -53,7 +50,10 @@ module Combi
 
     def publish(*args, &block)
       args[0] = args[0].to_json unless args[0].is_a? String
-      @exchange.publish *args, &block
+      @exchange.publish *args do
+        log "Sent to network drivers: #{args.inspect}"
+        block.call if block_given?
+      end
     end
 
     def queue(name, options = {}, &block)

data/lib/combi/response_store.rb

@@ -21,14 +21,22 @@ module Combi
 
   class EventedWaiter
     include EM::Deferrable
+    def self.log(message)
+      return unless @debug_mode ||= ENV['DEBUG'] == 'true'
+      puts "#{Time.now.to_f} #{self.name} #{message}"
+    end
 
     def self.wait_for(key, response_store, timeout)
-      waiter = new(key, response_store, timeout, Combi::Bus::RPC_MAX_POLLS)
+      t1 = Time.now
+      log "started waiting for #{key}"
+      waiter = new(key, response_store, timeout)
       response_store.add_waiter(key, waiter)
+      waiter.callback {|r| log "success waiting for #{key}: #{Time.now.to_f - t1.to_f}s" }
+      waiter.errback {|r| log "failed waiting for #{key}: #{Time.now.to_f - t1.to_f}s, #{r.inspect}" }
       waiter
     end
 
-    def initialize(key, response_store, timeout, max_polls)
+    def initialize(key, response_store, timeout)
       self.timeout(timeout, RuntimeError.new(Timeout::Error))
     end
 

data/lib/combi/version.rb

@@ -1,3 +1,3 @@
 module Combi
-  VERSION = '0.0.3'
+  VERSION = '0.0.4'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: combi
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - German Del Zotto
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-01 00:00:00.000000000 Z
+date: 2014-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
@@ -152,6 +152,7 @@ files:
 - combi.gemspec
 - lib/combi.rb
 - lib/combi/buses/bus.rb
+- lib/combi/buses/correlation.rb
 - lib/combi/buses/http.rb
 - lib/combi/buses/in_process.rb
 - lib/combi/buses/queue.rb
@@ -195,9 +196,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Mini Bus for microservices
 test_files: []
-has_rdoc: