isono 0.2.16 → 0.2.17

data/isono.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = "isono"
-  s.version = "0.2.16"
+  s.version = "0.2.17"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["axsh Ltd.", "Masahiro Fujiwara"]
-  s.date = "2012-10-02"
+  s.date = "2012-10-05"
   s.email = ["dev@axsh.net", "m-fujiwara@axsh.net"]
   s.executables = ["cli"]
   s.files = [".gitignore", "LICENSE", "NOTICE", "Rakefile", "bin/cli", "isono.gemspec", "lib/ext/shellwords.rb", "lib/isono.rb", "lib/isono/amqp_client.rb", "lib/isono/daemonize.rb", "lib/isono/event_delegate_context.rb", "lib/isono/event_observable.rb", "lib/isono/logger.rb", "lib/isono/manifest.rb", "lib/isono/messaging_client.rb", "lib/isono/models/event_log.rb", "lib/isono/models/job_state.rb", "lib/isono/models/node_state.rb", "lib/isono/models/resource_instance.rb", "lib/isono/node.rb", "lib/isono/node_modules/base.rb", "lib/isono/node_modules/data_store.rb", "lib/isono/node_modules/event_channel.rb", "lib/isono/node_modules/event_logger.rb", "lib/isono/node_modules/job_channel.rb", "lib/isono/node_modules/job_collector.rb", "lib/isono/node_modules/job_worker.rb", "lib/isono/node_modules/node_collector.rb", "lib/isono/node_modules/node_heartbeat.rb", "lib/isono/node_modules/rpc_channel.rb", "lib/isono/rack.rb", "lib/isono/rack/builder.rb", "lib/isono/rack/data_store.rb", "lib/isono/rack/job.rb", "lib/isono/rack/map.rb", "lib/isono/rack/object_method.rb", "lib/isono/rack/proc.rb", "lib/isono/rack/sequel.rb", "lib/isono/rack/thread_pass.rb", "lib/isono/resource_manifest.rb", "lib/isono/runner/base.rb", "lib/isono/runner/cli.rb", "lib/isono/runner/rpc_server.rb", "lib/isono/serializer.rb", "lib/isono/thread_pool.rb", "lib/isono/util.rb", "lib/isono/version.rb", "spec/amqp_client_spec.rb", "spec/event_observable_spec.rb", "spec/file_channel_spec.rb", "spec/job_channel_spec.rb", "spec/logger_spec.rb", "spec/manifest_spec.rb", "spec/node_spec.rb", "spec/resource_loader_spec.rb", "spec/rpc_channel_spec.rb", "spec/spec_helper.rb", "spec/thread_pool_spec.rb", "spec/util_spec.rb", "tasks/load_resource_manifest.rake"]

data/lib/isono.rb

@@ -59,5 +59,13 @@ module Isono
         File.expand_path('../../', __FILE__)
       end
     end
+
+    def at_disconnected(&blk)
+      @disconnected ||= []
+      if blk.is_a?(Proc)
+        @disconnected << blk
+      end
+      @disconnected
+    end
   end
 end

data/lib/isono/amqp_client.rb

@@ -77,6 +77,14 @@ module Isono
           def settings
             @settings
           end
+
+          @on_disconnect = Proc.new do
+            # This block will be executed when you start the Agent if the AMQP server has been stopped.
+            Isono.at_disconnected.each do |blk|
+              blk.call
+            end
+            blk.call(:error)
+          end
         }
         @amqp_client.connection_status { |t|
           case t
@@ -84,7 +92,11 @@ module Isono
             # here is tried also when reconnected
             on_connect
           when :disconnected
+            # This block is executed if the AMQP server goes down during startup.
             on_disconnected
+            Isono.at_disconnected.each do |blk|
+              blk.call
+            end
           end
         }
         # the block argument is called once at the initial connection.
@@ -94,10 +106,6 @@ module Isono
             blk.arity == 1 ? blk.call(self) : blk.call
           end
         }
-        @amqp_client.errback {
-          logger.error("Failed to connect to the broker: #{amqp_server_uri}")
-          blk.call(self) if blk && blk.arity == 1
-        }
       }
       self
     end
@@ -115,19 +123,6 @@ module Isono
     end
 
     def on_disconnected
-      logger.info("AMQP connection disconnected")
-      prepare_close {
-        @amqp_client.close {
-          begin
-            on_close
-            after_close
-          ensure
-            @amqp_client = nil
-            Thread.current[:mq] = nil
-            EM.stop { exit }
-          end
-        }
-      }
     end
 
     def on_close

data/lib/isono/node_modules/job_worker.rb

@@ -28,7 +28,7 @@ module Isono
       end
 
       terminate_hook do
-        @thread_pool.shutdown
+        @thread_pool.shutdown unless @thread_pool.nil?
       end
 
       def initialize(node, thread_pool=nil)

data/lib/isono/node_modules/rpc_channel.rb

@@ -203,10 +203,14 @@ module Isono
           }
           ch.prefetch(opts[:prefetch].to_i) if opts[:prefetch].to_i > 0
           # stores hash here that is for thread safety.
-          @endpoints[endpoint]={:app=>app, :opts=>opts, :ch=>ch}
+          if !@endpoints.nil?
+            @endpoints[endpoint]={:app=>app, :opts=>opts, :ch=>ch}
 
-          ch.endpoint_queue.subscribe(:ack=>true, &endpoint_proc)
-          event.publish('rpc/register', :args=>[endpoint])
+            ch.endpoint_queue.subscribe(:ack=>true, &endpoint_proc)
+            event.publish('rpc/register', :args=>[endpoint])
+          else
+            logger.error("No such endpoints")
+          end
         }
       end
 

data/lib/isono/version.rb

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
 
 module Isono
-  VERSION='0.2.16'
+  VERSION='0.2.17'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: isono
 version: !ruby/object:Gem::Version
-  version: 0.2.16
+  version: 0.2.17
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-02 00:00:00.000000000 Z
+date: 2012-10-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: amqp