perennial 1.2.2 → 1.2.3

data/lib/perennial/protocols/pure_ruby/json_transport.rb

@@ -26,6 +26,9 @@ end
 
 class Perennial::Protocols::PureRuby::JSONTransport
   
+  class Error < StandardError; end
+  class NoConnection < Error; end
+  
   @@callbacks = {}
   
   RETRY_DELAY = 30.0
@@ -51,10 +54,18 @@ class Perennial::Protocols::PureRuby::JSONTransport
   
   def read_message
     with_socket do |s|
-      message = JSON.parse(s.gets.strip)
-      return false if !message.is_a?(Hash)
+      raise NoConnection, "no connection the server at #{@host}:#{@port}" if s.nil?
+      message = nil
+      begin
+        Perennial::TimerImplementation.timeout(timeout) do
+          message = JSON.parse(s.gets.strip)
+        end
+      rescue Timeout::Error
+        return nil, nil
+      end
+      return nil, nil if !message.is_a?(Hash)
       action, payload = message["action"], message["payload"]
-      return false if !action.is_a?(String)
+      return nil, nil if !action.is_a?(String)
       payload = {} unless payload.is_a?(Hash)
       # We have a processed callback - huzzah!
       if payload.has_key?("callback-id")

data/lib/perennial.rb

@@ -9,7 +9,7 @@ require 'perennial/exceptions'
 
 module Perennial
   
-  VERSION = [1, 2, 2]
+  VERSION = [1, 2, 3]
   
   has_library :dispatchable, :hookable, :loader, :logger, :nash,
               :loggable, :manifest, :settings, :argument_parser,

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: perennial
 version: !ruby/object:Gem::Version 
-  version: 1.2.2
+  version: 1.2.3
 platform: ruby
 authors: 
 - Darcy Laycock
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-02 00:00:00 +08:00
+date: 2010-01-03 00:00:00 +08:00
 default_executable: perennial
 dependencies: 
 - !ruby/object:Gem::Dependency