cocaine-framework 0.12.0.pre.rc11 → 0.12.0.pre.rc12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9efb1a21fdd5a1b003173de5adac49c03ec69ae0
-  data.tar.gz: 7db1ed29a8d0b549f311eb863ec124ac20b013f5
+  metadata.gz: 61ff9e8e94378b608589075a7eb84926d4e45b0d
+  data.tar.gz: 7c362ec4035cc9c4d86bb03b7e33ea427526b0ee
 SHA512:
-  metadata.gz: e6b3ceb12864fea3a933cbe7bb4aebff63e7a28fcd9f1a7b90778a2e402b2746e57a80385484fc7aad54d66e9db87f1c885082cfe449f2cd10161588db54d6f3
-  data.tar.gz: 1b62eb843a0e0802de7937e68a30201400fbc6ef0c3b325f216df0437d7e84e4a70b2296529c4e48a27c9f5b651d2fa6a3ddccc080805e6d7152ff5dad771454
+  metadata.gz: b125012fe2b5cfc6764f2dc8b0295ad7635ab4b5af3e870ab3758caed08d134952f6ac1e2d2bba3dbc2ffd8116c1212a09dd639792677205045d96fb57e888e6
+  data.tar.gz: a05ec46783f26b660ff4773a79d03f77e36fa6b6415c416a9a6bb27779456ebc799a650fbb84cf4fdade56e7a2042830d65a4dcc777d109b0d2d663010cf5d27

data/lib/cocaine/cocaine.rb

@@ -75,7 +75,9 @@ module Cocaine
   end
 
   # [API]
-  # Read-only part for shared reader state.
+  # Read-only part for reader shared state.
+  # Allows to receive unpacked objects from the channel.
+  # Returns tuple with message id and payload.
   class RxMailbox < Mailbox
     def recv(timeout=30.0)
       @queue.receive timeout
@@ -83,7 +85,7 @@ module Cocaine
   end
 
   # [Detail]
-  # Write-only part for shared reader state.
+  # Write-only part for reader shared state.
   class TxMailbox < Mailbox
     def initialize(queue, tree, session, &block)
       super queue
@@ -106,10 +108,17 @@ module Cocaine
 
       @queue << [method, payload]
     end
+
+    def error(errno, reason)
+      @queue << [:error, [errno, reason]]
+
+      LOG.debug "Closing RX channel #{self} due to error: [#{errno}] #{reason}"
+      @close.call @session
+    end
   end
 
   # [Detail]
-  # Shared reader state, that acts like channel. Need for channel splitting between the library and a user.
+  # Reader shared state, that acts like channel. Need for channel splitting between the library and a user.
   class RxChannel
     attr_reader :tx, :rx
 
@@ -166,7 +175,7 @@ module Cocaine
   class ServiceError < IOError
   end
 
-  # [Detail]
+  # [API]
   # Service actor, which can define itself via its dispatch tree.
   class DefinedService < Meta
     include Celluloid::IO
@@ -202,6 +211,9 @@ module Cocaine
       async.run
     end
 
+    protected
+    def reinitialize; end
+
     private
     def run
       LOG.debug "Service '#{@name}' is running"
@@ -212,6 +224,12 @@ module Cocaine
           async.received *decoded
         end
       end
+    rescue EOFError => err
+      LOG.warn "Service '#{@name}' has lost connection with the Cloud"
+      @socket = nil
+      @sessions.each do |session, (tx, rx)|
+        rx.error 1, err.message
+      end
     end
 
     def received(session, id, payload)
@@ -225,6 +243,8 @@ module Cocaine
     end
 
     def invoke(id, *args)
+      reinitialize if @socket.nil?
+
       method, txtree, rxtree = @dispatch[id]
       LOG.debug "Invoking #{@name}[#{id}=#{method}] with #{args}"
 
@@ -233,13 +253,11 @@ module Cocaine
         @sessions.delete session
       end
 
-      @sessions[@counter] = [txchan, rxchan.tx]
-
       LOG.debug "<- [#{@counter}, #{id}, #{args}]"
       message = MessagePack.pack([@counter, id, args])
-      @counter += 1
-
       @socket.write message
+      @sessions[@counter] = [txchan, rxchan.tx]
+      @counter += 1
       return txchan, rxchan.rx
     end
   end
@@ -255,16 +273,24 @@ module Cocaine
   # Service class. All you need is name and (optionally) locator endpoint.
   class Service < DefinedService
     def initialize(name, host=nil, port=nil)
+      @options = { host: host, port: port }
+
       locator = Locator.new host, port
       tx, rx = locator.resolve name
       id, payload = rx.recv
       if id == :error
         raise ServiceError.new payload
       end
+      locator.terminate
 
       endpoints, version, dispatch = payload
       super name, endpoints, dispatch
     end
+
+    protected
+    def reinitialize
+      initialize @name, @options[:host], @options[:port]
+    end
   end
 
   # [Detail]

data/lib/cocaine/version.rb

@@ -1,3 +1,3 @@
 module Cocaine
-  VERSION = '0.12.0-rc11'
+  VERSION = '0.12.0-rc12'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cocaine-framework
 version: !ruby/object:Gem::Version
-  version: 0.12.0.pre.rc11
+  version: 0.12.0.pre.rc12
 platform: ruby
 authors:
 - Evgeny Safronov