tengine_core 0.5.33 → 0.5.34

data/Gemfile.lock

@@ -31,7 +31,7 @@ GEM
       bundler (~> 1.0)
       git (>= 1.2.5)
       rake
-    kramdown (0.13.4)
+    kramdown (0.13.5)
     macaddr (1.5.0)
       systemu (>= 2.4.0)
     mongo (1.5.2)

data/VERSION

@@ -1 +1 @@
-0.5.33
+0.5.34

data/lib/tengine/core/kernel.rb

@@ -181,8 +181,13 @@ class Tengine::Core::Kernel
       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
+        if Tengine::Core::Event.where(:key => raw_event.key, :sender_name => raw_event.sender_name).count > 0
+          fire_failed_event(raw_event)
+          headers.ack
+        else
+          Tengine.logger.info("requeue an event #{raw_event.inspect}")
+          headers.reject(:requeue => true)
+        end
         return false
       end
       event.kernel = self
@@ -248,7 +253,7 @@ class Tengine::Core::Kernel
         raise "Could not properly shut down; MQ broker is missing."
       end
     end
-    
+
     # see http://rdoc.info/github/ruby-amqp/amqp/master/file/docs/ErrorHandling.textile#Recovering_from_network_connection_failures
     # mq.connection raiases AMQP::TCPConnectionFailed unless connects to MQ.
     mq.add_hook :'connection.on_error' do |conn, connection_close|

data/spec/tengine/core/kernel_spec.rb

@@ -242,7 +242,7 @@ describe Tengine::Core::Kernel do
 
         it "https://www.pivotaltracker.com/story/show/22698533" do
           ev = Tengine::Event.new  :key => "2498e870-11cd-012f-f8c0-48bcc89f84e1", :source_name => "localhost/8110", :sender_name => "localhost/8110", :level => 2, :occurred_at => Time.now, :properties => {}, :event_type_name => ""
-          @header.should_receive(:ack)
+          @header.should_receive(:reject)
           @kernel.process_message(@header, ev.to_json).should_not be_true
         end
 
@@ -252,8 +252,8 @@ describe Tengine::Core::Kernel do
           @kernel.process_message(@header, raw_event.to_json).should_not be_true
         end
 
-        it "keyが同じ、sender_nameが異なる場合は、イベントストアへ登録を行わずACKを返却" do
-          @header.should_receive(:ack)
+        it "keyが同じ、sender_nameが異なる場合は、イベントストアへ登録を行わずREJECTを返却" do
+          @header.should_receive(:reject)
           raw_event = Tengine::Event.new(:key => "uuid1", :sender_name => "another_host", :event_type_name => "event1")
           lambda {
             Tengine::Core::Event.create!(raw_event.attributes.update(:confirmed => (raw_event.level <= @kernel.config.confirmation_threshold)))
@@ -367,6 +367,7 @@ describe Tengine::Core::Kernel do
 
         context "異常系" do
           it "無限地獄の回避" do
+            @header.stub(:reject)
             Tengine::Core::Event.stub(:create!).and_raise(Mongo::OperationFailure.new)
             e = Tengine::Event.new key: @uuid.generate, event_type_name: "something.failed.tengine"
 
@@ -589,16 +590,21 @@ describe Tengine::Core::Kernel do
         end
 
         it "tenginedが調停する #2" do
-          @header.stub(:ack)
+          mock_header1 = mock("header1")
+          mock_header2 = mock("header2")
+          mock_header3 = mock("header3")
+          mock_header1.stub(:ack)
+          mock_header2.stub(:reject)
+          mock_header3.stub(:reject)
           n = "alert.execution.job.tengine"
           s = "test test"
           e = Tengine::Event.new event_type_name: n, source_name: s, key: "k1"
           f = Tengine::Event.new event_type_name: n, source_name: s, key: "k2"
           g = Tengine::Event.new event_type_name: n, source_name: s, key: "k3"
 
-          @kernel.process_message @header, e.to_json
-          @kernel.process_message @header, f.to_json
-          @kernel.process_message @header, g.to_json
+          @kernel.process_message mock_header1, e.to_json
+          @kernel.process_message mock_header2, f.to_json
+          @kernel.process_message mock_header3, g.to_json
 
           Tengine::Core::Event.where(event_type_name: n, source_name: s).count.should == 1
         end
@@ -618,7 +624,7 @@ describe Tengine::Core::Kernel do
           :tengined => {
             :load_path => File.expand_path('../../../examples/uc01_execute_processing_for_event.rb', File.dirname(__FILE__)),
           },
-          :event_queue => { :connection => { :port => @port } } 
+          :event_queue => { :connection => { :port => @port } }
         })
         @kernel = Tengine::Core::Kernel.new(config)
       end
@@ -884,7 +890,7 @@ describe Tengine::Core::Kernel do
         end
         sender = mock(:sender)
         kernel.stub(:sender).and_return(sender)
-        
+
         EM.should_receive(:cancel_timer)
         sender.should_receive(:fire).with("finished.process.core.tengine", an_instance_of(Hash))
 

data/tengine_core.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "tengine_core"
-  s.version = "0.5.33"
+  s.version = "0.5.34"
 
   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-20"
+  s.date = "2012-02-21"
   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"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tengine_core
 version: !ruby/object:Gem::Version
-  version: 0.5.33
+  version: 0.5.34
   prerelease: 
 platform: ruby
 authors:
@@ -14,11 +14,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-20 00:00:00.000000000Z
+date: 2012-02-21 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70326622039380 !ruby/object:Gem::Requirement
+  requirement: &70354082424400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -26,10 +26,10 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *70326622039380
+  version_requirements: *70354082424400
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &70326622038860 !ruby/object:Gem::Requirement
+  requirement: &70354082423860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -37,10 +37,10 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *70326622038860
+  version_requirements: *70354082423860
 - !ruby/object:Gem::Dependency
   name: selectable_attr
-  requirement: &70326622038320 !ruby/object:Gem::Requirement
+  requirement: &70354082423340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -48,10 +48,10 @@ dependencies:
         version: 0.3.15
   type: :runtime
   prerelease: false
-  version_requirements: *70326622038320
+  version_requirements: *70354082423340
 - !ruby/object:Gem::Dependency
   name: bson
-  requirement: &70326622037260 !ruby/object:Gem::Requirement
+  requirement: &70354082422760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -59,10 +59,10 @@ dependencies:
         version: 1.5.2
   type: :runtime
   prerelease: false
-  version_requirements: *70326622037260
+  version_requirements: *70354082422760
 - !ruby/object:Gem::Dependency
   name: bson_ext
-  requirement: &70326622008260 !ruby/object:Gem::Requirement
+  requirement: &70354082422220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -70,10 +70,10 @@ dependencies:
         version: 1.5.2
   type: :runtime
   prerelease: false
-  version_requirements: *70326622008260
+  version_requirements: *70354082422220
 - !ruby/object:Gem::Dependency
   name: mongo
-  requirement: &70326622007780 !ruby/object:Gem::Requirement
+  requirement: &70354082421720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -81,10 +81,10 @@ dependencies:
         version: 1.5.2
   type: :runtime
   prerelease: false
-  version_requirements: *70326622007780
+  version_requirements: *70354082421720
 - !ruby/object:Gem::Dependency
   name: mongoid
-  requirement: &70326622007280 !ruby/object:Gem::Requirement
+  requirement: &70354082421220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -92,10 +92,10 @@ dependencies:
         version: 2.3.3
   type: :runtime
   prerelease: false
-  version_requirements: *70326622007280
+  version_requirements: *70354082421220
 - !ruby/object:Gem::Dependency
   name: tengine_support
-  requirement: &70326622006760 !ruby/object:Gem::Requirement
+  requirement: &70354082420740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -103,10 +103,10 @@ dependencies:
         version: 0.3.12
   type: :runtime
   prerelease: false
-  version_requirements: *70326622006760
+  version_requirements: *70354082420740
 - !ruby/object:Gem::Dependency
   name: tengine_event
-  requirement: &70326622006240 !ruby/object:Gem::Requirement
+  requirement: &70354082420240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -114,10 +114,10 @@ dependencies:
         version: 0.4.0
   type: :runtime
   prerelease: false
-  version_requirements: *70326622006240
+  version_requirements: *70354082420240
 - !ruby/object:Gem::Dependency
   name: daemons
-  requirement: &70326622005720 !ruby/object:Gem::Requirement
+  requirement: &70354082419720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -125,10 +125,10 @@ dependencies:
         version: 1.1.4
   type: :runtime
   prerelease: false
-  version_requirements: *70326622005720
+  version_requirements: *70354082419720
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70326622005240 !ruby/object:Gem::Requirement
+  requirement: &70354082419200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -136,10 +136,10 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *70326622005240
+  version_requirements: *70354082419200
 - !ruby/object:Gem::Dependency
   name: factory_girl
-  requirement: &70326622004720 !ruby/object:Gem::Requirement
+  requirement: &70354082418680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -147,10 +147,10 @@ dependencies:
         version: 2.1.2
   type: :development
   prerelease: false
-  version_requirements: *70326622004720
+  version_requirements: *70354082418680
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &70326622004120 !ruby/object:Gem::Requirement
+  requirement: &70354082418080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -158,10 +158,10 @@ dependencies:
         version: 0.7.2
   type: :development
   prerelease: false
-  version_requirements: *70326622004120
+  version_requirements: *70354082418080
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70326622003520 !ruby/object:Gem::Requirement
+  requirement: &70354082417480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -169,10 +169,10 @@ dependencies:
         version: 1.0.18
   type: :development
   prerelease: false
-  version_requirements: *70326622003520
+  version_requirements: *70354082417480
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70326622002940 !ruby/object:Gem::Requirement
+  requirement: &70354082416900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -180,10 +180,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *70326622002940
+  version_requirements: *70354082416900
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &70326622002340 !ruby/object:Gem::Requirement
+  requirement: &70354082416400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -191,10 +191,10 @@ dependencies:
         version: 0.5.3
   type: :development
   prerelease: false
-  version_requirements: *70326622002340
+  version_requirements: *70354082416400
 - !ruby/object:Gem::Dependency
   name: ZenTest
-  requirement: &70326622001800 !ruby/object:Gem::Requirement
+  requirement: &70354082415720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -202,10 +202,10 @@ dependencies:
         version: 4.6.2
   type: :development
   prerelease: false
-  version_requirements: *70326622001800
+  version_requirements: *70354082415720
 - !ruby/object:Gem::Dependency
   name: rdiscount
-  requirement: &70326622001260 !ruby/object:Gem::Requirement
+  requirement: &70354082415240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -213,10 +213,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70326622001260
+  version_requirements: *70354082415240
 - !ruby/object:Gem::Dependency
   name: kramdown
-  requirement: &70326622000660 !ruby/object:Gem::Requirement
+  requirement: &70354082414600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -224,7 +224,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70326622000660
+  version_requirements: *70354082414600
 description: tengine_core is a framework/engine to support distributed processing
 email: tengine@nautilus-technologies.com
 executables: