isono 0.1.0 → 0.2.0

data/.gitignore

@@ -0,0 +1,2 @@
+*~
+#*#

data/Rakefile

@@ -0,0 +1,38 @@
+# -*- coding: utf-8 -*-
+$LOAD_PATH.unshift File.expand_path('../lib', __FILE__)
+require 'isono/version'
+
+
+task :gem do
+  require 'rubygems'
+  require 'rake/gempackagetask'
+  
+  spec = Gem::Specification.new do |s|
+    s.platform = Gem::Platform::RUBY
+    s.version = Isono::VERSION
+    s.authors = ['axsh Ltd.', 'Masahiro Fujiwara']
+    s.email = ['dev@axsh.net', 'm-fujiwara@axsh.net']
+    s.homepage = 'http://github.com/axsh/isono'
+    s.summary = 'Messaging and agent fabric'
+    s.name = 'isono'
+    s.require_path = 'lib'
+    s.required_ruby_version = '>= 1.8.7'
+    s.rubyforge_project = 'isono'
+    
+    s.files = `git ls-files -c`.split("\n")
+    
+    s.bindir='bin'
+    s.executables = %w(cli)
+    
+    s.add_dependency "amqp", "0.7.0"
+    s.add_dependency "eventmachine", "1.0.0.beta.3"
+    s.add_dependency "statemachine", ">= 1.0.0"
+    s.add_dependency "log4r"
+
+    s.add_development_dependency 'bacon'
+    s.add_development_dependency 'rake'
+  end
+
+  File.open('isono.gemspec', 'w'){|f| f.write(spec.to_ruby) }
+  sh "gem build isono.gemspec"
+end

data/isono.gemspec

@@ -2,43 +2,44 @@
 
 Gem::Specification.new do |s|
   s.name = %q{isono}
-  s.version = "0.1.0"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["axsh Ltd.", "Masahiro Fujiwara"]
-  s.date = %q{2010-11-18}
+  s.date = %q{2011-05-26}
   s.default_executable = %q{cli}
   s.email = ["dev@axsh.net", "m-fujiwara@axsh.net"]
   s.executables = ["cli"]
-  s.files = ["bin/cli", "lib/ext/shellwords.rb", "lib/isono.rb", "lib/isono/rack/object_method.rb", "lib/isono/rack/proc.rb", "lib/isono/rack/data_store.rb", "lib/isono/rack/map.rb", "lib/isono/rack/job.rb", "lib/isono/rack/builder.rb", "lib/isono/rack/thread_pass.rb", "lib/isono/logger.rb", "lib/isono/rack.rb", "lib/isono/messaging_client.rb", "lib/isono/resource_manifest.rb", "lib/isono/node.rb", "lib/isono/manifest.rb", "lib/isono/event_delegate_context.rb", "lib/isono/amqp_client.rb", "lib/isono/node_modules/job_channel.rb", "lib/isono/node_modules/base.rb", "lib/isono/node_modules/event_logger.rb", "lib/isono/node_modules/event_channel.rb", "lib/isono/node_modules/node_heartbeat.rb", "lib/isono/node_modules/node_collector.rb", "lib/isono/node_modules/data_store.rb", "lib/isono/node_modules/job_collector.rb", "lib/isono/node_modules/rpc_channel.rb", "lib/isono/node_modules/job_worker.rb", "lib/isono/serializer.rb", "lib/isono/models/node_state.rb", "lib/isono/models/resource_instance.rb", "lib/isono/models/event_log.rb", "lib/isono/models/job_state.rb", "lib/isono/daemonize.rb", "lib/isono/util.rb", "lib/isono/thread_pool.rb", "lib/isono/runner/rpc_server.rb", "lib/isono/runner/agent.rb", "lib/isono/event_observable.rb", "isono.gemspec", "LICENSE", "NOTICE"]
+  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/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"]
   s.homepage = %q{http://github.com/axsh/isono}
   s.require_paths = ["lib"]
   s.required_ruby_version = Gem::Requirement.new(">= 1.8.7")
-  s.rubygems_version = %q{1.3.6}
-  s.summary = %q{Messageing and agent fabric}
+  s.rubyforge_project = %q{isono}
+  s.rubygems_version = %q{1.3.7}
+  s.summary = %q{Messaging and agent fabric}
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<amqp>, [">= 0.6.7"])
-      s.add_runtime_dependency(%q<eventmachine>, [">= 0.12.10"])
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<amqp>, ["= 0.7.0"])
+      s.add_runtime_dependency(%q<eventmachine>, ["= 1.0.0.beta.3"])
       s.add_runtime_dependency(%q<statemachine>, [">= 1.0.0"])
       s.add_runtime_dependency(%q<log4r>, [">= 0"])
       s.add_development_dependency(%q<bacon>, [">= 0"])
       s.add_development_dependency(%q<rake>, [">= 0"])
     else
-      s.add_dependency(%q<amqp>, [">= 0.6.7"])
-      s.add_dependency(%q<eventmachine>, [">= 0.12.10"])
+      s.add_dependency(%q<amqp>, ["= 0.7.0"])
+      s.add_dependency(%q<eventmachine>, ["= 1.0.0.beta.3"])
       s.add_dependency(%q<statemachine>, [">= 1.0.0"])
       s.add_dependency(%q<log4r>, [">= 0"])
       s.add_dependency(%q<bacon>, [">= 0"])
       s.add_dependency(%q<rake>, [">= 0"])
     end
   else
-    s.add_dependency(%q<amqp>, [">= 0.6.7"])
-    s.add_dependency(%q<eventmachine>, [">= 0.12.10"])
+    s.add_dependency(%q<amqp>, ["= 0.7.0"])
+    s.add_dependency(%q<eventmachine>, ["= 1.0.0.beta.3"])
     s.add_dependency(%q<statemachine>, [">= 1.0.0"])
     s.add_dependency(%q<log4r>, [">= 0"])
     s.add_dependency(%q<bacon>, [">= 0"])

data/lib/isono.rb

@@ -1,14 +1,14 @@
 # -*- coding: utf-8 -*-
 
 module Isono
-  VERSION='0.1.0'
-
+  require 'isono/version'
+  require 'isono/logger'
+  
   autoload :Node, 'isono/node'
   autoload :AmqpClient, 'isono/amqp_client'
   autoload :Daemonize, 'isono/daemonize'
   autoload :Util, 'isono/util'
   autoload :ThreadPool, 'isono/thread_pool'
-  autoload :Logger, 'isono/logger'
   autoload :Manifest, 'isono/manifest'
   autoload :Serializer, 'isono/serializer'
   autoload :EventObservable, 'isono/event_observable'
@@ -28,7 +28,8 @@ module Isono
     autoload :JobCollector, 'isono/node_modules/job_collector'
   end  
   module Runner
-    autoload :Agent, 'isono/runner/agent'
+    autoload :Base, 'isono/runner/base'
+    autoload :CLI, 'isono/runner/cli'
     autoload :RpcServer, 'isono/runner/rpc_server'
   end
   module Rack

data/lib/isono/amqp_client.rb

@@ -71,26 +71,35 @@ module Isono
         :pass=>broker_uri.password ||default[:pass]
       }
       opts.merge!(args) if args.is_a?(Hash)
-      
-      @amqp_client = ::AMQP.connect(opts)
-      @amqp_client.instance_eval {
-        def settings
-          @settings
-        end
-      }
-      @amqp_client.callback {
-        on_connect
-        if blk
-          blk.arity == 1 ? blk.call(:success) : blk.call
-        end            
-      }
-      @amqp_client.errback {
-        logger.error("Failed to connect to the broker: #{amqp_server_uri}")
-        blk.call(:error) if blk && blk.arity == 1
-      }
-      # Note: Thread.current[:mq] is utilized in amqp gem.
-      Thread.current[:mq] = ::MQ.new(@amqp_client)
 
+      prepare_connect {
+        @amqp_client = ::AMQP.connect(opts)
+        @amqp_client.instance_eval {
+          def settings
+            @settings
+          end
+        }
+        @amqp_client.connection_status { |t|
+          case t
+          when :connected
+            # here is tried also when reconnected
+            on_connect
+          when :disconnected
+            on_disconnected
+          end
+        }
+        # the block argument is called once at the initial connection.
+        @amqp_client.callback {
+          after_connect
+          if blk
+            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
 
@@ -105,24 +114,50 @@ module Isono
 
     def on_connect
     end
-    
+
+    def on_disconnected
+    end
+
     def on_close
     end
 
+    def before_connect
+    end
+
+    def after_connect
+    end
+
+    def before_close
+    end
+
+    def after_close
+    end
+    
     def close(&blk)
       return unless connected?
 
-      @amqp_client.close {
-        begin
-          on_close
-          blk.call if blk
-        ensure
-          @amqp_client = nil
-          Thread.current[:mq] = nil
-        end
+      prepare_close {
+        @amqp_client.close {
+          begin
+            on_close
+            after_close
+            blk.call if blk
+          ensure
+            @amqp_client = nil
+            Thread.current[:mq] = nil
+          end
+        }
       }
     end
 
+    # Create new AMQP channel object
+    #
+    # @note Do not have to close by user. Channel close is performed
+    #       as part of connection close.
+    def create_channel
+      MQ.new(@amqp_client)
+    end
+
     # Publish a message to the designated exchange.
     # 
     # @param [String] exname The exchange name
@@ -148,22 +183,16 @@ module Isono
       }
     end
 
-    def define_queue(queue_name, exchange_name, opts={}, &blk)
-      q = amq.queue(queue_name, opts)
-      amq.exchanges.has_key? exchange_name
-      q.bind( exchange_name, opts ).subscribe &blk
+    private
+    def prepare_connect(&blk)
+      before_connect
+      blk.call
     end
 
-
-    def identity_queue(unique_id)
-      amq.direct('identity')
-      begin
-        define_queue("ident.#{unique_id}", "identity", {:exclusive=>true, :nowait=>false})
-      rescue MQ::Error => e
-        logger.error("The node having same ID already exists: #{unique_id}")
-        raise e
-      end
+    def prepare_close(&blk)
+      before_close
+      blk.call
     end
-
+    
   end
 end

data/lib/isono/logger.rb

@@ -6,16 +6,18 @@ module Isono
   # Injects +logger+ method to the included class.
   # The output message from the logger methods starts the module name trailing message body.
   module Logger
+    @rootlogger = Log4r::Logger.new('Isono')
+
+    def self.initialize(l4r_output=Log4r::StdoutOutputter.new('stdout'))
+      # Isono top level logger
+      formatter = Log4r::PatternFormatter.new(:depth => 9999, # stack trace depth
+                                              :pattern => "%d %c [%l]: %M",
+                                              :date_format => "%Y/%m/%d %H:%M:%S"
+                                              )
+      l4r_output.formatter = formatter
+      @rootlogger.outputters = l4r_output
+    end
 
-    # Isono top level logger
-    rootlog = Log4r::Logger.new('Isono')
-    formatter = Log4r::PatternFormatter.new(:depth => 9999, # stack trace depth
-                                            :pattern => "%d %c [%l]: %M",
-                                            :date_format => "%Y/%m/%d %H:%M:%S"
-                                            )
-    rootlog.add(Log4r::StdoutOutputter.new('stdout', :formatter => formatter))
-    
-    
     def self.included(klass)
       klass.class_eval {
 
@@ -45,4 +47,12 @@ module Isono
     end
 
   end
+
+  # Set STDOUT as the default log output.
+  # To replace another log device, put the line below at the top of
+  # your code:
+  #  Isono::Logger.initialize(Log4r::SyslogOutputter.new('mysyslog'))
+  # To disable any of log output:
+  #  Isono::Logger.initialize(Log4r::Outputter.new('null'))
+  Logger.initialize
 end

data/lib/isono/manifest.rb

@@ -25,14 +25,15 @@ module Isono
     
     # @param [String] app_root Application root folder
     # @param [block]
-    def initialize(app_root, &blk)
+    def initialize(app_root='.', &blk)
       @node_modules = []
       resolve_abs_app_root(app_root)
       @config = ConfigStruct.new
       @config.app_root = app_root
 
       instance_eval(&blk) if blk
-      load_config
+      
+      load_config(@config_path) if @config_path
     end
 
     # Regist a node module class to be initialized/terminated.
@@ -65,7 +66,7 @@ module Isono
     end
 
     def node_id
-      "#{@node_name}-#{@node_instance_id}"
+      "#{@node_name}.#{@node_instance_id}"
     end
 
     def config_path(path=nil)
@@ -79,18 +80,16 @@ module Isono
       end
       @config
     end
-
     
-    private
     # load config file and merge up with the config tree.
     # it will not work when the config_path is nil or the file is missed
-    def load_config
-      if @config_path && File.exist?(@config_path)
-        buf = File.read(@config_path) 
-        eval("#{buf}", binding, @config_path)
-      end
+    def load_config(path)
+      return unless File.exist?(path)
+      buf = File.read(path) 
+      eval("#{buf}", binding, path)
     end
 
+    private
     def resolve_abs_app_root(app_root_path)
       pt = Pathname.new(app_root_path)
       if pt.absolute?

data/lib/isono/node.rb

@@ -12,6 +12,7 @@ module Isono
     include EventObservable
 
     def self.inherited(klass)
+      super
       klass.class_eval {
         include Logger
       }
@@ -66,46 +67,61 @@ module Isono
       manifest.node_id
     end
 
-    def on_connect
+    def before_connect
       raise "node_id is not set" if node_id.nil?
 
-      #amq.prefetch(1)
-      identity_queue(node_id)
-      init_modules
-
-      fire_event(:node_ready, {:node_id=> self.node_id})
-      logger.info("Started : AMQP Server=#{amqp_server_uri.to_s}, ID=#{node_id}, token=#{boot_token}")
-    end
-
-    def on_close
-      term_modules
-    end
+      @value_objects = {}
 
-    private
-    
-    def init_modules
       manifest.node_modules.each { |modclass, *args|
         if !@value_objects.has_key?(modclass)
           @value_objects[modclass] = vo = ValueObject.new(self, modclass)
 
-          if modclass.initialize_hook.is_a?(Proc)
-            vo.instance_eval(&modclass.initialize_hook)
-          end
-
-          logger.debug("Initialized #{modclass.to_s}")
+          node_hook_proc(:before_connect).call(modclass, *args)
         end
       }
     end
 
-    def term_modules
-      manifest.node_modules.reverse.each { |modclass, *args|
+    def after_connect
+      setup_identity_queue
+
+      manifest.node_modules.each &node_hook_proc(:after_connect)
+      # TODO: remove initialize_hook
+      manifest.node_modules.each &node_hook_proc(:initialize)
+      
+      logger.info("Started : AMQP Server=#{amqp_server_uri.to_s}, ID=#{node_id}, token=#{boot_token}")
+    end
+
+    def before_close
+      manifest.node_modules.reverse.each &node_hook_proc(:before_close)
+      # TODO: remove terminate_hook
+      manifest.node_modules.reverse.each &node_hook_proc(:terminate)
+    end
+
+    def after_close
+      manifest.node_modules.reverse.each &node_hook_proc(:after_close)
+    end
+
+    private
+
+    def node_hook_proc(hook)
+      proc { |modclass, *args|
+        node_hook = modclass.node_hooks[hook]
+        next unless node_hook.is_a?(Proc)
         vo = @value_objects[modclass]
-        if vo && modclass.terminate_hook.is_a?(Proc)
-          vo.instance_eval(&modclass.terminate_hook)
+        if vo 
+          vo.instance_eval(&node_hook)
         end
-        logger.info("Terminated #{modclass.to_s}")
       }
     end
+    
+    def setup_identity_queue
+      amq = create_channel
+      amq.errback {
+        logger.error("The node has same node ID is running already")
+        exit(1)
+      }
+      amq.queue("ident.#{node_id}", {:exclusive=>true})
+    end
 
     class ValueObject
       module DelegateMethods