combi 0.0.9 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 842db51c04bfe53f9a03dee7e7a7dcd1c82d7256
-  data.tar.gz: a18fba47f8b819d81f994a2afbe7d2243a459b6b
+  metadata.gz: 3f8dd32e52dae0a89b7735c068747bea3631b916
+  data.tar.gz: 1358f37dd615511fa8167aec2eb1216a01b40090
 SHA512:
-  metadata.gz: 50e91d8a37b80e45563311c0b0e6c5d7ced744388292b9a4e964138f45d392c337b19d3cc128bfc713ad8dd5fe7e13846bace1d7a707257dbac1e2177483c5f5
-  data.tar.gz: 8448f3cb3c208674c7f7ebe225b0827d3914a5378064dad0633ac6c6bca6797424039276a4c4839a99921b3aaca0b0c0ca736f972c85c6a604785e052b81c6e3
+  metadata.gz: 006f1a70c15f329a70d8c66ff5778bc56f476cfb487456aec27c9cf010941f9008ad078353e437645cbed41300dce201cb1e40077243d769a0b293c9e1f8f5d3
+  data.tar.gz: 785e8e846ac024b3a56b0551113f3a190e017ede7ce78237b718a74a22e9b43c489609baf8b6e65dd05ef14a489b79ce95061d6fdaf6d30e0d439b87b77c740c

data/lib/combi/buses/http.rb

@@ -57,14 +57,14 @@ module Combi
           begin
             response = service_instance.send(kind, message['payload'])
           rescue Exception => e
-            response = {error: true, message: e.message}
+            response = {error: {message: e.message, backtrace: e.backtrace } }
           end
           {result: 'ok', response: response}
         else
-          {result: 'error', response: {error: true, message: 'unknown action'}}
+          {result: 'error', response: {error: 'unknown action'}}
         end
       else
-        {result: 'error', response: {error: true, message: 'unknown service'}}
+        {result: 'error', response: {error: 'unknown service'}}
       end
     end
 
@@ -84,10 +84,11 @@ module Combi
       url = "#{@options[:remote_api]}#{name}/#{kind}"
       request_async = EventMachine::HttpRequest.new(url, connection_timeout: options[:timeout]).post(body: message.to_json)
       request_async.callback do |r|
-        waiter.succeed(JSON.parse(r.response)['response'])
+        parsed = JSON.parse(r.response)
+        waiter.succeed(parsed['response'])
       end
       request_async.errback do |x|
-        waiter.fail(RuntimeError.new(Timeout::Error))
+        waiter.fail(Timeout::Error.new)
       end
       waiter
     end

data/lib/combi/buses/in_process.rb

@@ -8,7 +8,7 @@ module Combi
       handler = memory_handlers[handler_name.to_s]
       waiter = EventMachine::DefaultDeferrable.new
       if handler.nil?
-        waiter.fail('error' => true, 'message' => 'unknown service')
+        waiter.fail('error' => 'unknown service')
       else
         service_instance = handler[:service_instance]
         message = JSON.parse(message.to_json)
@@ -19,22 +19,25 @@ module Combi
               response = service_instance.send(kind, message)
               if response.respond_to? :succeed
                 response.callback do |service_response|
+                  log "responding with deferred response: #{service_response.inspect[0..500]}"
                   waiter.succeed service_response
                 end
+                response.errback do |service_response|
+                  failure_response = { 'error' => service_response }
+                  log "responding with deferred failure: #{service_response.inspect[0..500]}"
+                  waiter.fail(failure_response)
+                end
               else
                 waiter.succeed response
               end
             end
           rescue Timeout::Error => e
-            log "ERROR"
-            waiter.fail RuntimeError.new(Timeout::Error)
+            waiter.fail Timeout::Error.new
           rescue Exception => e
-            log "other ERROR"
-            log e.inspect
-            waiter.fail({'error' => true, 'message' => e.message})
+            waiter.fail 'error' => { 'message' => e.message, 'backtrace' => e.backtrace}
           end
         else
-          waiter.fail('error' => true, 'message' => 'unknown action')
+          waiter.fail('error' => 'unknown action')
         end
       end
       waiter

data/lib/combi/buses/queue.rb

@@ -69,11 +69,11 @@ module Combi
         begin
           response = service_instance.send(kind, payload)
         rescue Exception => e
-          response = {error: true, message: e.message}
+          response = {error: { message: e.message, backtrace: e.backtrace } }
         end
       else
         log "Service instance does not respond to #{kind}: #{service_instance.inspect}"
-        response = {error: true, message: 'unknown action'}
+        response = {error: 'unknown action'}
       end
       if response.respond_to? :succeed
         log "response is deferred"
@@ -81,6 +81,11 @@ module Combi
           log "responding with deferred answer: #{service_response.inspect[0..500]}"
           queue_service.respond(service_response.to_json, delivery_info)
         end
+        response.errback do |service_response|
+          failure_response = { error: service_response }
+          log "responding with deferred failure: #{service_response.inspect[0..500]}"
+          queue_service.respond(failure_response.to_json, delivery_info)
+        end
       else
         log "responding with inmediate answer: #{response.inspect[0..500]}"
         queue_service.respond(response.to_json, delivery_info)

data/lib/combi/buses/web_socket.rb

@@ -173,7 +173,7 @@ module Combi
       begin
         response = invoke_service(service_name, kind, payload)
       rescue Exception => e
-        response = {error: true, message: e.message}
+        response = {error: {message: e.message, backtrace: e.backtrace } }
       end
 
       msg = {result: 'ok', correlation_id: message['correlation_id']}
@@ -185,6 +185,12 @@ module Combi
           msg[:response] = service_response.to_json
           ws.send(msg.to_json)
         end
+        response.errback do |service_response|
+          log "responding with deferred error: #{service_response.inspect[0..500]}"
+          error_response = { error: service_response }
+          msg[:response] = error_response.to_json
+          ws.send(msg.to_json)
+        end
       else
         log "responding with inmediate answer: #{response.inspect[0..500]}"
         msg[:response] = response.to_json
@@ -200,12 +206,12 @@ module Combi
           response = service_instance.send(kind, payload)
         else
           log "[WARNING] Service #{service_name}(#{service_instance.class.name}) does not respond to message #{kind}"
-          response = {error: true, message: 'unknown action'}
+          response = {error: 'unknown action'}
         end
       else
         log "[WARNING] Service #{service_name} not found"
         log "[WARNING] handlers: #{handlers.keys.inspect}"
-        response = {error: true, message: 'unknown service'}
+        response = {error: 'unknown service'}
       end
     end
 

data/lib/combi/helpers.rb

@@ -2,21 +2,27 @@ require 'timeout'
 
 module Combi
 
+  class ServiceError < StandardError
+  end
+
   def self.wait_for(defer, options = {}, &block)
     options[:timeout] ||= 2
     waiter_thread = Thread.current
+    success_response, error_response = nil
     defer.callback { |response|
-      block.call response
+      success_response = response
       waiter_thread.wakeup
     }
     defer.errback { |response|
-      log "waiting for result, received an error"
-      log response
-      block.call error: true, message: 'service request error'
+      STDERR << "waiting for result, received an error: #{response.inspect}\n"
+      error_response = response
       waiter_thread.wakeup
     }
     Timeout::timeout(options[:timeout]) do
       Thread.stop
+      puts "\t AFTER STOP"
+      raise ServiceError.new(error_response) if error_response
+      block.call success_response
     end
   end
 

data/lib/combi/queue_service.rb

@@ -43,9 +43,7 @@ module Combi
     end
 
     def disconnect
-      @amqp_conn.close do
-        puts "disconnected from RABBIT"
-      end
+      @amqp_conn.close
     end
 
     def publish(*args, &block)

data/lib/combi/response_store.rb

@@ -15,8 +15,13 @@ module Combi
     def handle_rpc_response(response)
       correlation_id = response['correlation_id']
       waiter = @waiters[correlation_id]
-      response = response['response']
-      waiter.succeed(JSON.parse response) if waiter.respond_to? :succeed
+      return unless waiter
+      response = JSON.parse response['response']
+      if response.respond_to?(:keys) and response['error']
+        waiter.fail(response)
+      else
+        waiter.succeed(response)
+      end
     end
 
     def finish(key)

data/lib/combi/version.rb

@@ -1,3 +1,3 @@
 module Combi
-  VERSION = '0.0.9'
+  VERSION = '0.0.10'
 end

data/spec/integration/multi_bus_spec.rb

@@ -31,13 +31,13 @@ describe "in a multi bus environment" do
           service_result = EM::Synchrony.sync req
           if service_result.is_a? RuntimeError
             if @other_client.is_a?(Combi::Queue) && service_result.message == "Timeout::Error"
-              defer.succeed({'error' => true, 'message' => 'other service failed'})
+              defer.fail('other service failed')
             else
-              defer.succeed({'error' => true, 'message' => 'unknown error'})
+              defer.fail('unknown error')
             end
           else
-            if service_result.respond_to?(:keys) && service_result['error'] == true
-              defer.succeed({'error' => true, 'message' => 'other service failed'})
+            if service_result.respond_to?(:keys) && service_result['error']
+              defer.fail('other service failed')
             else
               defer.succeed(service_result*2)
             end
@@ -51,7 +51,7 @@ describe "in a multi bus environment" do
   Given(:broken_service) do
     Module.new do
       def actions; [:say_hello_if_you_can]; end
-      def do_it(params); puts "raising error"; raise "I can't talk" ; end
+      def do_it(params); raise "I can't talk" ; end
     end
   end
 
@@ -173,8 +173,7 @@ describe "in a multi bus environment" do
               prepare
               EM.synchrony do
                 service_result = EM::Synchrony.sync main_bus_consumer.request(:say_hello_if_you_can, :do_it, params, options)
-                service_result['error'].should be_true
-                service_result['message'].should eq "I can't talk"
+                service_result['error']['message'].should eq "I can't talk"
                 done
                 finalize
               end
@@ -192,8 +191,7 @@ describe "in a multi bus environment" do
               EM.synchrony do
                 params.merge!('service_name' => 'say_hello_if_you_can')
                 service_result = EM::Synchrony.sync main_bus_consumer.request(:repeat_with_me, :do_it, params, options)
-                service_result['error'].should be_true
-                service_result['message'].should eq 'other service failed'
+                service_result['error'].should eq 'other service failed'
                 done
                 finalize
               end

data/spec/shared_examples/standard_bus.rb

@@ -59,7 +59,7 @@ shared_examples_for "standard_bus" do
     end
   end
 
-  context 'raises Timeout::Error when the response is slow' do
+  context 'fails with error => Timeout::Error when the response is slow' do
     Given(:time_base) { 0.01 }
     When(:params) { { time: time_base*4 } }
     When(:service) { provider.add_service slow_service }
@@ -67,10 +67,9 @@ shared_examples_for "standard_bus" do
       em do
         prepare
         EM.synchrony do
-          expect do
-            service_result = EM::Synchrony.sync consumer.request(:sleep, :do_it, params, { timeout: time_base/2.0 })
-            raise Kernel.const_get(service_result.message) if service_result.is_a? Exception
-          end.to raise_error Timeout::Error
+          service_result = EM::Synchrony.sync consumer.request(:sleep, :do_it, params, { timeout: time_base/2.0 })
+          service_result.should be_an Exception
+          service_result.message.should eq 'Timeout::Error'
           done(time_base) #timeout response must came before this timeout
         end
         finalize
@@ -143,8 +142,10 @@ shared_examples_for "standard_bus" do
         prepare
         EM.synchrony do
           service_result = EM::Synchrony.sync consumer.request(:shout_error, :do_it, {message: error_message}, { timeout: 0.1 })
-          service_result['error'].should be_true
-          service_result['message'].should eq error_message
+          service_result['error'].should be_a Hash
+          service_result['error']['message'].should eq error_message
+          service_result['error']['backtrace'].should_not be_nil
+          service_result['error']['backtrace'].should be_an Array
           done
           finalize
         end
@@ -165,8 +166,7 @@ shared_examples_for "standard_bus" do
               consumer.class.should eq Combi::Queue
               service_result.message.should eq "Timeout::Error"
             else
-              service_result['error'].should be_true
-              service_result['message'].should eq error_message
+              service_result['error'].should eq error_message
             end
             done
             finalize
@@ -185,8 +185,7 @@ shared_examples_for "standard_bus" do
         EM.synchrony do
           begin
             service_result = EM::Synchrony.sync consumer.request(:echo_this, :do_other, {}, { timeout: 0.1 })
-            service_result['error'].should be_true
-            service_result['message'].should eq error_message
+            service_result['error'].should eq error_message
             done
             finalize
           end

data/spec/support/rabbitmq_server.rb

@@ -27,7 +27,9 @@ class RabbitmqServer
   end
 
   def start_forwarder!
-    @forwarder_pid = Process.spawn '/usr/local/bin/boot2docker', 'ssh', '-L',  "#{port}:localhost:#{port}", '-N'
+    command = "/usr/local/bin/boot2docker ssh -L #{port}:localhost:#{port} -N"
+    return if @_command_running ||= `ps`.include?(command)
+    @forwarder_pid = Process.spawn command
     #Process.detach @forwarder_pid
     puts "starting forwarder pid: #{@forwarder_pid}"
   end
@@ -53,14 +55,16 @@ class RabbitmqServer
 
   def is_port_open?(ip, port, timeout = 15)
     begin
+      service = "rabbit @ #{ip}##{port}"
       Timeout::timeout(timeout) do
         begin
           s = TCPSocket.new(ip, port)
           s.close
           return true
         rescue Errno::ECONNREFUSED, Errno::EHOSTUNREACH
-          puts "conn error to rabbit @ #{ip}##{port}"
+          puts "conn error to #{service}"
           sleep 1
+          puts "\tretrying connection to #{service}"
           retry
         end
       end

data/spec/support/web_server.rb

@@ -13,6 +13,13 @@ class DeferrableBody
         self.succeed
       end
     end
+    @defer.errback do |service_response|
+      error_response = { error: service_response }
+      EM::next_tick do
+        self.call [{result: 'ok', response: error_response}.to_json]
+        self.fail
+      end
+    end
   end
 
   def each(&block)
@@ -29,7 +36,6 @@ end
 
 def start_web_server(http_bus, port, webserver = 'thin')
   require webserver
-  puts "starting web server '#{webserver}' at port #{port}"
   app = lambda do |env|
     response_message = http_bus.manage_request(env)
     if response_message[:response].respond_to? :succeed
@@ -43,8 +49,8 @@ def start_web_server(http_bus, port, webserver = 'thin')
       response_rack
     end
   end
+  Thin::Logging.silent = true if webserver == 'thin'
   rack_handler = Rack::Handler.get(webserver)
   rack_handler.run app, Port: port
-  puts "EM WEB STARTED"
   sleep 0.1
 end

data/spec/support/websocket_server.rb

@@ -1,13 +1,11 @@
 require 'em-websocket'
 
 def start_em_websocket_server(websocket_bus, port)
-  puts "starting websocket server at port #{port}"
   ws_handler = Class.new do
     def new_session(arg); end
   end.new
   EM::WebSocket.start(host: '0.0.0.0', port: port) do |ws|
     websocket_bus.manage_ws_event(ws, ws_handler)
   end
-  puts "EM WEBSOCKET STARTED"
   sleep 0.1
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: combi
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
 platform: ruby
 authors:
 - German Del Zotto
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-30 00:00:00.000000000 Z
+date: 2014-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yajl-ruby