tengine_core 0.5.31 → 0.5.32

data/Gemfile.lock

@@ -58,12 +58,12 @@ GEM
       simplecov-html (~> 0.5.3)
     simplecov-html (0.5.3)
     systemu (2.4.2)
-    tengine_event (0.4.6)
+    tengine_event (0.4.8)
       activesupport (>= 3.0.0)
       amqp (~> 0.8.0)
       tengine_support (>= 0.3.24)
       uuid (~> 2.3.4)
-    tengine_support (0.3.24)
+    tengine_support (0.3.26)
       activesupport (>= 3.0.0)
     tzinfo (0.3.31)
     uuid (2.3.5)

data/VERSION

@@ -1 +1 @@
-0.5.31
+0.5.32

data/lib/tengine/core/kernel.rb

@@ -172,19 +172,16 @@ class Tengine::Core::Kernel
 
       rescue Mongo::OperationFailure, Mongoid::Errors::Validations => e
         Tengine.logger.warn("failed to store an event.\n[#{e.class.name}] #{e.message}")
-        # Model.exists?だと上手くいかない時があるのでModel.whereを使っています
-        # fire_failed_event(raw_event) if Tengine::Core::Event.exists?(confitions: { key: raw_event.key, sender_name: raw_event.sender_name })
-        fire_failed_event(raw_event) if Tengine::Core::Event.where(:key => raw_event.key, :sender_name => raw_event.sender_name).count > 0
-        headers.ack
-        return false
-
+        event = nil
       rescue Exception => e
         Tengine.logger.error("failed to save an event #{raw_event.inspect}\n[#{e.class.name}] #{e.message}")
-        headers.ack
-        return false
+        event = nil
       end
 
       unless event
+        # Model.exists?だと上手くいかない時があるのでModel.whereを使っています
+        # fire_failed_event(raw_event) if Tengine::Core::Event.exists?(confitions: { key: raw_event.key, sender_name: raw_event.sender_name })
+        fire_failed_event(raw_event) if Tengine::Core::Event.where(:key => raw_event.key, :sender_name => raw_event.sender_name).count > 0
         headers.ack
         return false
       end

data/spec/tengine/core/kernel_spec.rb

@@ -381,7 +381,6 @@ describe Tengine::Core::Kernel do
           @header.stub(:ack)
           @sender = mock(:sender)
           @kernel.stub(:sender).and_return(@sender)
-          @sender.should_not_receive(:fire)
         end
 
         shared_examples "generic heartbeats" do
@@ -504,6 +503,18 @@ describe Tengine::Core::Kernel do
               Tengine::Core::Event.where(key: e.key).count.should == 1
               Tengine::Core::Event.where(key: e.key).first.event_type_name.should =~ /expired/
             end
+
+            it "finished -> finished (失敗する)" do
+              EM.stub(:next_tick).and_yield
+              e = Tengine::Event.new key: @uuid.generate, event_type_name: "finished.process.#{kind}.tengine"
+              @sender.should_receive(:fire).with("finished.process.#{kind}.tengine.failed.tengined", an_instance_of(Hash))
+
+              @kernel.process_message @header, e.to_json
+              @kernel.process_message @header, e.to_json
+
+              Tengine::Core::Event.where(key: e.key).count.should == 1
+              Tengine::Core::Event.where(key: e.key).first.event_type_name.should =~ /finished/
+            end
           end
 
           context "異常系" do

data/tengine_core.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "tengine_core"
-  s.version = "0.5.31"
+  s.version = "0.5.32"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["taigou", "totty", "g-morita", "shyouhei", "akm", "hiroshinakao"]
-  s.date = "2012-02-16"
+  s.date = "2012-02-17"
   s.description = "tengine_core is a framework/engine to support distributed processing"
   s.email = "tengine@nautilus-technologies.com"
   s.executables = ["tengined", "tengine_heartbeat_watchd", "tengine_atd"]
@@ -177,7 +177,7 @@ Gem::Specification.new do |s|
   s.homepage = "http://github.com/tengine/tengine_core"
   s.licenses = ["MPL2.0/LGPLv3"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.16"
+  s.rubygems_version = "1.8.15"
   s.summary = "tengine_core is a framework/engine to support distributed processing"
 
   if s.respond_to? :specification_version then

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tengine_core
 version: !ruby/object:Gem::Version
-  version: 0.5.31
+  version: 0.5.32
   prerelease: 
 platform: ruby
 authors:
@@ -14,11 +14,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-16 00:00:00.000000000Z
+date: 2012-02-17 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70155971816080 !ruby/object:Gem::Requirement
+  requirement: &70278185546440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -26,10 +26,10 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *70155971816080
+  version_requirements: *70278185546440
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &70155971815600 !ruby/object:Gem::Requirement
+  requirement: &70278185545960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -37,10 +37,10 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *70155971815600
+  version_requirements: *70278185545960
 - !ruby/object:Gem::Dependency
   name: selectable_attr
-  requirement: &70155971815120 !ruby/object:Gem::Requirement
+  requirement: &70278185545440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -48,10 +48,10 @@ dependencies:
         version: 0.3.15
   type: :runtime
   prerelease: false
-  version_requirements: *70155971815120
+  version_requirements: *70278185545440
 - !ruby/object:Gem::Dependency
   name: bson
-  requirement: &70155971814640 !ruby/object:Gem::Requirement
+  requirement: &70278185544840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -59,10 +59,10 @@ dependencies:
         version: 1.5.2
   type: :runtime
   prerelease: false
-  version_requirements: *70155971814640
+  version_requirements: *70278185544840
 - !ruby/object:Gem::Dependency
   name: bson_ext
-  requirement: &70155971814160 !ruby/object:Gem::Requirement
+  requirement: &70278185544240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -70,10 +70,10 @@ dependencies:
         version: 1.5.2
   type: :runtime
   prerelease: false
-  version_requirements: *70155971814160
+  version_requirements: *70278185544240
 - !ruby/object:Gem::Dependency
   name: mongo
-  requirement: &70155971813680 !ruby/object:Gem::Requirement
+  requirement: &70278185543640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -81,10 +81,10 @@ dependencies:
         version: 1.5.2
   type: :runtime
   prerelease: false
-  version_requirements: *70155971813680
+  version_requirements: *70278185543640
 - !ruby/object:Gem::Dependency
   name: mongoid
-  requirement: &70155971813200 !ruby/object:Gem::Requirement
+  requirement: &70278185542980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -92,10 +92,10 @@ dependencies:
         version: 2.3.3
   type: :runtime
   prerelease: false
-  version_requirements: *70155971813200
+  version_requirements: *70278185542980
 - !ruby/object:Gem::Dependency
   name: tengine_support
-  requirement: &70155971812720 !ruby/object:Gem::Requirement
+  requirement: &70278185542380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -103,10 +103,10 @@ dependencies:
         version: 0.3.12
   type: :runtime
   prerelease: false
-  version_requirements: *70155971812720
+  version_requirements: *70278185542380
 - !ruby/object:Gem::Dependency
   name: tengine_event
-  requirement: &70155971812240 !ruby/object:Gem::Requirement
+  requirement: &70278185541720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -114,10 +114,10 @@ dependencies:
         version: 0.4.0
   type: :runtime
   prerelease: false
-  version_requirements: *70155971812240
+  version_requirements: *70278185541720
 - !ruby/object:Gem::Dependency
   name: daemons
-  requirement: &70155971811760 !ruby/object:Gem::Requirement
+  requirement: &70278185541120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -125,10 +125,10 @@ dependencies:
         version: 1.1.4
   type: :runtime
   prerelease: false
-  version_requirements: *70155971811760
+  version_requirements: *70278185541120
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70155971811280 !ruby/object:Gem::Requirement
+  requirement: &70278185540520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -136,10 +136,10 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *70155971811280
+  version_requirements: *70278185540520
 - !ruby/object:Gem::Dependency
   name: factory_girl
-  requirement: &70155971810800 !ruby/object:Gem::Requirement
+  requirement: &70278185539920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -147,10 +147,10 @@ dependencies:
         version: 2.1.2
   type: :development
   prerelease: false
-  version_requirements: *70155971810800
+  version_requirements: *70278185539920
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &70155971810320 !ruby/object:Gem::Requirement
+  requirement: &70278185506400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -158,10 +158,10 @@ dependencies:
         version: 0.7.2
   type: :development
   prerelease: false
-  version_requirements: *70155971810320
+  version_requirements: *70278185506400
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70155971826200 !ruby/object:Gem::Requirement
+  requirement: &70278185505800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -169,10 +169,10 @@ dependencies:
         version: 1.0.18
   type: :development
   prerelease: false
-  version_requirements: *70155971826200
+  version_requirements: *70278185505800
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70155971825720 !ruby/object:Gem::Requirement
+  requirement: &70278185505200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -180,10 +180,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *70155971825720
+  version_requirements: *70278185505200
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &70155971825240 !ruby/object:Gem::Requirement
+  requirement: &70278185504600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -191,10 +191,10 @@ dependencies:
         version: 0.5.3
   type: :development
   prerelease: false
-  version_requirements: *70155971825240
+  version_requirements: *70278185504600
 - !ruby/object:Gem::Dependency
   name: ZenTest
-  requirement: &70155971824760 !ruby/object:Gem::Requirement
+  requirement: &70278185504020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -202,10 +202,10 @@ dependencies:
         version: 4.6.2
   type: :development
   prerelease: false
-  version_requirements: *70155971824760
+  version_requirements: *70278185504020
 - !ruby/object:Gem::Dependency
   name: rdiscount
-  requirement: &70155971824280 !ruby/object:Gem::Requirement
+  requirement: &70278185503460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -213,10 +213,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70155971824280
+  version_requirements: *70278185503460
 - !ruby/object:Gem::Dependency
   name: kramdown
-  requirement: &70155971823800 !ruby/object:Gem::Requirement
+  requirement: &70278185502980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -224,7 +224,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70155971823800
+  version_requirements: *70278185502980
 description: tengine_core is a framework/engine to support distributed processing
 email: tengine@nautilus-technologies.com
 executables: