tengine_core 0.5.37 → 0.5.38

data/VERSION

@@ -1 +1 @@
-0.5.37
+0.5.38

data/lib/tengine/core/mongoid_fix.rb

@@ -25,7 +25,7 @@ if Mongoid::VERSION < "3.0.0"
       begin
         yield
       rescue Mongo::ConnectionFailure, Mongo::OperationTimeout, Mongo::OperationFailure => ex
-        raise unless ex.class == Mongo::OperationFailure and ex.message !~ /not master/
+        raise if ex.class == Mongo::OperationFailure and ex.message !~ /not master/
 
         retries += 1
         raise if retries > Mongoid.max_retries_on_connection_failure

data/lib/tengine/core/mutex.rb

@@ -143,10 +143,23 @@ class Tengine::Core::Mutex
     end
   end
 
+  def synchronize_internal ttl, blk
+    # stop stack consumption
+    EM.add_timer ttl do
+      begin
+        synchronize(&blk)
+      rescue Exception => e
+        msg = sprintf "%p\n%s", e, e.backtrace.join("\n")
+        Tengine.logger.error msg
+        # no raise
+      end
+    end
+  end
+
   public
 
   # delays until you get a lock.
-  def synchronize
+  def synchronize(&block)
     raise ArgumentError, "no block given" unless block_given?
 
     if lock
@@ -161,11 +174,7 @@ class Tengine::Core::Mutex
       end
     else
       # NG, try again later
-      EM.add_timer mutex.ttl do
-        synchronize do
-          yield
-        end
-      end
+      synchronize_internal mutex.ttl, block
     end
   end
 

data/spec/tengine/core/mutex_spec.rb

@@ -140,6 +140,23 @@ describe Tengine::Core::Mutex do
       x.should < z
       y.should <= z
     end
+
+    it "synchronizes #5: no stack overflow" do
+      STDERR.puts "This test takes two minutes to run.  Relax and take a cup of coffee."
+      m = Tengine::Core::Mutex.new "test mutex 03", 0.00000000001
+      n = m.mutex
+      n.waiters ||= []
+      n.waiters << { :_id => 1, :timeout => Time.now + 120 }
+      n.save
+
+      expect do
+        EM.run do
+          m.synchronize do
+            EM.stop
+          end
+        end
+      end.to_not raise_error(SystemStackError)
+    end
   end
 
   context "#heartbeat" do

data/tengine_core.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "tengine_core"
-  s.version = "0.5.37"
+  s.version = "0.5.38"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["taigou", "totty", "g-morita", "shyouhei", "akm", "hiroshinakao"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tengine_core
 version: !ruby/object:Gem::Version
-  version: 0.5.37
+  version: 0.5.38
   prerelease: 
 platform: ruby
 authors:
@@ -18,7 +18,7 @@ date: 2012-02-22 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70303062943180 !ruby/object:Gem::Requirement
+  requirement: &70159437844500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -26,10 +26,10 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *70303062943180
+  version_requirements: *70159437844500
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &70303062942700 !ruby/object:Gem::Requirement
+  requirement: &70159437844020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -37,10 +37,10 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *70303062942700
+  version_requirements: *70159437844020
 - !ruby/object:Gem::Dependency
   name: selectable_attr
-  requirement: &70303062942220 !ruby/object:Gem::Requirement
+  requirement: &70159437843540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -48,10 +48,10 @@ dependencies:
         version: 0.3.15
   type: :runtime
   prerelease: false
-  version_requirements: *70303062942220
+  version_requirements: *70159437843540
 - !ruby/object:Gem::Dependency
   name: bson
-  requirement: &70303062941740 !ruby/object:Gem::Requirement
+  requirement: &70159437843060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -59,10 +59,10 @@ dependencies:
         version: 1.5.2
   type: :runtime
   prerelease: false
-  version_requirements: *70303062941740
+  version_requirements: *70159437843060
 - !ruby/object:Gem::Dependency
   name: bson_ext
-  requirement: &70303062941260 !ruby/object:Gem::Requirement
+  requirement: &70159437842580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -70,10 +70,10 @@ dependencies:
         version: 1.5.2
   type: :runtime
   prerelease: false
-  version_requirements: *70303062941260
+  version_requirements: *70159437842580
 - !ruby/object:Gem::Dependency
   name: mongo
-  requirement: &70303062940780 !ruby/object:Gem::Requirement
+  requirement: &70159437842100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -81,10 +81,10 @@ dependencies:
         version: 1.5.2
   type: :runtime
   prerelease: false
-  version_requirements: *70303062940780
+  version_requirements: *70159437842100
 - !ruby/object:Gem::Dependency
   name: mongoid
-  requirement: &70303062940300 !ruby/object:Gem::Requirement
+  requirement: &70159437841620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -92,10 +92,10 @@ dependencies:
         version: 2.3.3
   type: :runtime
   prerelease: false
-  version_requirements: *70303062940300
+  version_requirements: *70159437841620
 - !ruby/object:Gem::Dependency
   name: tengine_support
-  requirement: &70303062939820 !ruby/object:Gem::Requirement
+  requirement: &70159437841140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -103,10 +103,10 @@ dependencies:
         version: 0.3.12
   type: :runtime
   prerelease: false
-  version_requirements: *70303062939820
+  version_requirements: *70159437841140
 - !ruby/object:Gem::Dependency
   name: tengine_event
-  requirement: &70303062939340 !ruby/object:Gem::Requirement
+  requirement: &70159437840660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -114,10 +114,10 @@ dependencies:
         version: 0.4.0
   type: :runtime
   prerelease: false
-  version_requirements: *70303062939340
+  version_requirements: *70159437840660
 - !ruby/object:Gem::Dependency
   name: daemons
-  requirement: &70303062955240 !ruby/object:Gem::Requirement
+  requirement: &70159437856540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -125,10 +125,10 @@ dependencies:
         version: 1.1.4
   type: :runtime
   prerelease: false
-  version_requirements: *70303062955240
+  version_requirements: *70159437856540
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70303062954760 !ruby/object:Gem::Requirement
+  requirement: &70159437856060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -136,10 +136,10 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *70303062954760
+  version_requirements: *70159437856060
 - !ruby/object:Gem::Dependency
   name: factory_girl
-  requirement: &70303062954280 !ruby/object:Gem::Requirement
+  requirement: &70159437855580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -147,10 +147,10 @@ dependencies:
         version: 2.1.2
   type: :development
   prerelease: false
-  version_requirements: *70303062954280
+  version_requirements: *70159437855580
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &70303062953800 !ruby/object:Gem::Requirement
+  requirement: &70159437855100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -158,10 +158,10 @@ dependencies:
         version: 0.7.2
   type: :development
   prerelease: false
-  version_requirements: *70303062953800
+  version_requirements: *70159437855100
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70303062953320 !ruby/object:Gem::Requirement
+  requirement: &70159437854620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -169,10 +169,10 @@ dependencies:
         version: 1.0.18
   type: :development
   prerelease: false
-  version_requirements: *70303062953320
+  version_requirements: *70159437854620
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70303062952840 !ruby/object:Gem::Requirement
+  requirement: &70159437854140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -180,10 +180,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *70303062952840
+  version_requirements: *70159437854140
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &70303062952360 !ruby/object:Gem::Requirement
+  requirement: &70159437853660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -191,10 +191,10 @@ dependencies:
         version: 0.5.3
   type: :development
   prerelease: false
-  version_requirements: *70303062952360
+  version_requirements: *70159437853660
 - !ruby/object:Gem::Dependency
   name: ZenTest
-  requirement: &70303062951880 !ruby/object:Gem::Requirement
+  requirement: &70159437853180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -202,10 +202,10 @@ dependencies:
         version: 4.6.2
   type: :development
   prerelease: false
-  version_requirements: *70303062951880
+  version_requirements: *70159437853180
 - !ruby/object:Gem::Dependency
   name: rdiscount
-  requirement: &70303062951400 !ruby/object:Gem::Requirement
+  requirement: &70159437852700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -213,10 +213,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70303062951400
+  version_requirements: *70159437852700
 - !ruby/object:Gem::Dependency
   name: kramdown
-  requirement: &70303062950920 !ruby/object:Gem::Requirement
+  requirement: &70159437852220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -224,7 +224,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70303062950920
+  version_requirements: *70159437852220
 description: tengine_core is a framework/engine to support distributed processing
 email: tengine@nautilus-technologies.com
 executables: