isono 0.2.20 → 0.2.21

data/Rakefile

@@ -19,7 +19,7 @@ task :gem do
     s.required_ruby_version = '>= 1.9.2'
     s.rubyforge_project = 'isono'
     
-    s.files = `git ls-files -c`.split("\n")
+    s.files = [%q{LICENSE}, %q{NOTICE}, %q{Rakefile}, %q{isono.gemspec}] + Dir['lib/**/*.rb', 'spec/*.rb', 'tasks/*.rake', 'bin/cli']
     
     s.bindir='bin'
     s.executables = %w(cli)

data/isono.gemspec

@@ -2,23 +2,23 @@
 
 Gem::Specification.new do |s|
   s.name = "isono"
-  s.version = "0.2.20"
+  s.version = "0.2.21"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["axsh Ltd.", "Masahiro Fujiwara"]
-  s.date = "2013-06-20"
+  s.date = "2018-02-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"]
+  s.files = ["LICENSE", "NOTICE", "Rakefile", "isono.gemspec", "lib/isono/manifest.rb", "lib/isono/node_modules/job_channel.rb", "lib/isono/node_modules/node_collector.rb", "lib/isono/node_modules/event_channel.rb", "lib/isono/node_modules/data_store.rb", "lib/isono/node_modules/job_collector.rb", "lib/isono/node_modules/base.rb", "lib/isono/node_modules/rpc_channel.rb", "lib/isono/node_modules/job_worker.rb", "lib/isono/node_modules/node_heartbeat.rb", "lib/isono/node_modules/event_logger.rb", "lib/isono/models/resource_instance.rb", "lib/isono/models/job_state.rb", "lib/isono/models/node_state.rb", "lib/isono/models/event_log.rb", "lib/isono/rack.rb", "lib/isono/logger.rb", "lib/isono/resource_manifest.rb", "lib/isono/util.rb", "lib/isono/daemonize.rb", "lib/isono/runner/rpc_server.rb", "lib/isono/runner/base.rb", "lib/isono/runner/cli.rb", "lib/isono/node.rb", "lib/isono/amqp_client.rb", "lib/isono/version.rb", "lib/isono/event_observable.rb", "lib/isono/rack/thread_pass.rb", "lib/isono/rack/data_store.rb", "lib/isono/rack/builder.rb", "lib/isono/rack/object_method.rb", "lib/isono/rack/map.rb", "lib/isono/rack/proc.rb", "lib/isono/rack/job.rb", "lib/isono/rack/sequel.rb", "lib/isono/messaging_client.rb", "lib/isono/thread_pool.rb", "lib/isono/event_delegate_context.rb", "lib/isono/serializer.rb", "lib/isono.rb", "lib/ext/shellwords.rb", "spec/event_observable_spec.rb", "spec/amqp_client_spec.rb", "spec/manifest_spec.rb", "spec/logger_spec.rb", "spec/file_channel_spec.rb", "spec/spec_helper.rb", "spec/job_channel_spec.rb", "spec/rpc_channel_spec.rb", "spec/node_spec.rb", "spec/resource_loader_spec.rb", "spec/util_spec.rb", "spec/thread_pool_spec.rb", "tasks/load_resource_manifest.rake", "bin/cli"]
   s.homepage = "http://github.com/axsh/isono"
   s.require_paths = ["lib"]
   s.required_ruby_version = Gem::Requirement.new(">= 1.9.2")
   s.rubyforge_project = "isono"
-  s.rubygems_version = "2.0.3"
+  s.rubygems_version = "1.8.23"
   s.summary = "Messaging and agent fabric"
 
   if s.respond_to? :specification_version then
-    s.specification_version = 4
+    s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<amqp>, ["= 0.7.4"])

data/lib/isono/models/node_state.rb

@@ -26,7 +26,7 @@ module Isono
       
       def process_event(ev, *args)
         case [ev, self.state.to_sym]
-        when [:on_ping, :online], [:on_ping, :init], [:on_ping, :timeout]
+        when [:on_ping, :online], [:on_ping, :init], [:on_ping, :timeout], [:on_ping, :offline]
           self.state = :online
           self.last_ping_at = Time.now
         when [:on_unmonitor, :online]

data/lib/isono/node_modules/data_store.rb

@@ -26,6 +26,9 @@ module Isono
             DataStore.logger.info("disconnected database connection: #{v}")
           }
         }
+
+        desc "database thread number"
+        database_thread 10
       end
 
 
@@ -65,7 +68,7 @@ module Isono
       attr_reader :db_writer_thread
 
       initialize_hook do
-        @db_writer_thread = ThreadPool.new(1, 'DataStore')
+        @db_writer_thread = ThreadPool.new(config_section.database_thread.to_i, 'DataStore')
         DataStore.create_instance(node)
       end
       

data/lib/isono/node_modules/job_collector.rb

@@ -4,10 +4,17 @@ module Isono
   module NodeModules
     class JobCollector < Base
 
+      config_section do
+        desc "count to send sql."
+        retry_count 3
+        desc "second(s) to wait until send the next sql."
+        wait_time_sec 1
+      end
+
       initialize_hook do
         rpc = RpcChannel.new(node)
 
-        app = Rack::DataStore.new(Dispatch.new)
+        app = Rack::DataStore.new(Dispatch.new(config_section.retry_count, config_section.wait_time_sec))
         
         rpc.register_endpoint('job-collector', app)
       end
@@ -16,10 +23,28 @@ module Isono
       end
 
       class Dispatch
+        def initialize(retry_count, wait_time_sec)
+          @retry_count = retry_count
+          @wait_time_sec = wait_time_sec
+
+        end
+
         def record
           params = @req.args[0]
           params[:node_id]=@req.sender
-          job =Models::JobState.find_or_create(:job_id=>params[:job_id])
+
+          retry_count = 0
+          begin
+            job = Models::JobState.find_or_create(:job_id=>params[:job_id])
+          rescue Sequel::DatabaseError, Sequel::DatabaseConnectionError => e
+            if retry_count <= @retry_count.to_i
+              retry_count += 1
+              sleep @wait_time_sec.to_i
+              retry
+            else
+              raise e
+            end
+          end
           job.set_fields(params, [:parent_job_id, :session_id, :node_id, :state, :started_at, :finished_at, :job_name]).save_changes
         end
         

data/lib/isono/node_modules/node_collector.rb

@@ -8,8 +8,10 @@ module Isono
       config_section do
         desc "time in second to recognize if the agent is timed out"
         timeout_sec (10*2).to_f
+        desc "time in second to recognize if the agent is offline"
+        offline_sec (10*2*2).to_f
         desc "the agent to be killed from the datasource after the time of second"
-        kill_sec (10*2*2).to_f
+        kill_sec (10*2*2*8).to_f
         desc ""
         gc_period 20.0
       end
@@ -30,18 +32,20 @@ module Isono
             # http://www.mail-archive.com/sqlite-users@sqlite.org/msg03328.html
             # TODO: paging support for the large result set.
             Models::NodeState.dataset.all.each { |row|
-              next if row.state == :offline
-
               diff_time = Time.now - row[:last_ping_at]
-              if row.state != :timeout && diff_time > config_section.timeout_sec
+              if row.state != "timeout" && row.state != "offline" && diff_time > config_section.timeout_sec
                 row.process_event(:on_timeout)
                 row.save_changes
                 event.publish('node_collector/timedout', :args=>[row.values])
               end
-              
-              if diff_time > config_section.kill_sec
+
+              if row.state != "offline" && diff_time > config_section.offline_sec
                 row.process_event(:on_unmonitor)
+                row.save_changes
+                event.publish('node_collector/offline', :args=>[row.values])
+              end
 
+              if diff_time > config_section.kill_sec
                 event.publish('node_collector/killed', :args=>[row.values])
                 row.destroy
               end

data/lib/isono/version.rb

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

metadata

@@ -1,7 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: isono
 version: !ruby/object:Gem::Version
-  version: 0.2.20
+  version: 0.2.21
+  prerelease: 
 platform: ruby
 authors:
 - axsh Ltd.
@@ -9,11 +10,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-20 00:00:00.000000000 Z
+date: 2018-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: amqp
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -21,6 +23,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -28,6 +31,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -35,6 +39,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -42,43 +47,49 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: log4r
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bacon
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: 
@@ -90,87 +101,87 @@ executables:
 extensions: []
 extra_rdoc_files: []
 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/node_collector.rb
+- lib/isono/node_modules/event_channel.rb
+- lib/isono/node_modules/data_store.rb
 - lib/isono/node_modules/job_collector.rb
+- lib/isono/node_modules/base.rb
+- lib/isono/node_modules/rpc_channel.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/node_modules/event_logger.rb
+- lib/isono/models/resource_instance.rb
+- lib/isono/models/job_state.rb
+- lib/isono/models/node_state.rb
+- lib/isono/models/event_log.rb
 - lib/isono/rack.rb
-- lib/isono/rack/builder.rb
+- lib/isono/logger.rb
+- lib/isono/resource_manifest.rb
+- lib/isono/util.rb
+- lib/isono/daemonize.rb
+- lib/isono/runner/rpc_server.rb
+- lib/isono/runner/base.rb
+- lib/isono/runner/cli.rb
+- lib/isono/node.rb
+- lib/isono/amqp_client.rb
+- lib/isono/version.rb
+- lib/isono/event_observable.rb
+- lib/isono/rack/thread_pass.rb
 - lib/isono/rack/data_store.rb
-- lib/isono/rack/job.rb
-- lib/isono/rack/map.rb
+- lib/isono/rack/builder.rb
 - lib/isono/rack/object_method.rb
+- lib/isono/rack/map.rb
 - lib/isono/rack/proc.rb
+- lib/isono/rack/job.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/messaging_client.rb
 - lib/isono/thread_pool.rb
-- lib/isono/util.rb
-- lib/isono/version.rb
-- spec/amqp_client_spec.rb
+- lib/isono/event_delegate_context.rb
+- lib/isono/serializer.rb
+- lib/isono.rb
+- lib/ext/shellwords.rb
 - spec/event_observable_spec.rb
+- spec/amqp_client_spec.rb
+- spec/manifest_spec.rb
+- spec/logger_spec.rb
 - spec/file_channel_spec.rb
+- spec/spec_helper.rb
 - spec/job_channel_spec.rb
-- spec/logger_spec.rb
-- spec/manifest_spec.rb
+- spec/rpc_channel_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
+- spec/thread_pool_spec.rb
 - tasks/load_resource_manifest.rake
+- bin/cli
 homepage: http://github.com/axsh/isono
 licenses: []
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: isono
-rubygems_version: 2.0.3
+rubygems_version: 1.8.23
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Messaging and agent fabric
 test_files: []

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: 1e666f9b342338026fe08b4880bf74dfb60673f8
-  data.tar.gz: a1127479b2ad3c83acff866011b1eaee1286907e
-SHA512:
-  metadata.gz: 6271d86c5ec057bf267a3bc4322f19fdc83187d9ae1635691757a878688a66c67fa2a00d099cf9c3d7347feecd8e7ba99c3caec1d3f8522c76226a8f8af0a79c
-  data.tar.gz: 7ce671336b7e6bb8db77aaa8782445ce15ba1920f90ece1ce7cdf5edde5374697f0080995b9df0df64756bd7b4a42f8e0351e8d40f24da87276f0f282f864461

data/.gitignore

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