serverengine 1.5.3 → 1.5.4

data/Changelog

@@ -1,4 +1,10 @@
 
+2013-09-10 version 1.5.4:
+
+* SignalThread: fixed "Unexpected error can't be called from trap context"
+  error in Ruby 2.0 (Thanks to @jondot and @sonots)
+
+
 2013-06-30 version 1.5.3:
 
 * Daemon: uses Process::UID.from_name and Process::GID.from_name

data/lib/serverengine/daemon.rb

@@ -88,8 +88,8 @@ module ServerEngine
     def run
       begin
         exit main
-      rescue
-        ServerEngine.dump_uncaught_error($!)
+      rescue => e
+        ServerEngine.dump_uncaught_error(e)
         exit @daemonize_error_exit_code
       end
     end

data/lib/serverengine/signal_thread.rb

@@ -43,7 +43,7 @@ module ServerEngine
 
       old = @handlers[sig]
       if block
-        Kernel.trap(sig) { enqueue(sig) }
+        Kernel.trap(sig) { signal_handler_main(sig) }
         @handlers[sig] = block
       else
         Kernel.trap(sig, command)
@@ -59,83 +59,58 @@ module ServerEngine
 
     def stop
       @mutex.synchronize do
-        ## synchronized state 1
         @finished = true
         @cond.broadcast
-        ## synchronized state 2
       end
       self
     end
 
     private
 
-    def main
-      @mutex.lock
+    def signal_handler_main(sig)
+      # here always creates new thread to avoid
+      # complicated race conditin in signal handlers
+      Thread.new do
+        begin
+          enqueue(sig)
+        rescue => e
+          ServerEngine.dump_uncaught_error(e)
+        end
+      end
+    end
 
+    def main
       until @finished
-        ## synchronized state 3
+        sig = nil
 
-        sig = @queue.shift
-        unless sig
-          ## synchronized state 4
-          @cond.wait(@mutex, 1)
-          next
-        end
+        @mutex.synchronize do
+          while true
+            return if @finished
 
-        ## synchronized state 5
+            sig = @queue.shift
+            break if sig
+
+            @cond.wait(@mutex, 1)
+          end
+        end
 
-        @mutex.unlock
         begin
           @handlers[sig].call(sig)
-        rescue
-          ServerEngine.dump_uncaught_error($!)
-        ensure
-          @mutex.lock
+        rescue => e
+          ServerEngine.dump_uncaught_error(e)
         end
       end
 
-      ## synchronized state 6
       nil
 
     ensure
-      @mutex.unlock
       @finished = false
     end
 
     def enqueue(sig)
-      @queue << sig
-
-      unless @mutex.try_lock
-        #
-        # here couldn't acquire @mutex.
-        #
-        #   A) a thread is in synchronized state 1 or 2.
-        #      In this case, here doesn't have to broadcast because the thread will/did broadcast.
-        #
-        #   B) `self` thread is in synchronized state 3
-        #      In this case, here doesn't have to broadcast because the `self` thread will
-        #      take a task from the queue soon.
-        #
-        #   C) `self` thread is in synchronized state 4
-        #      In this case, here needs to broadcast but doesn't broadcast. Thus it causes
-        #      blocking upto 1 second :(
-        #
-        #   D) `self` thread is in synchronized state 5
-        #      In this case, here doesn't have to broadcast because the `self` thread will
-        #      change to synchronized state 3 or 6 soon.
-        #
-        #   E) the main thread (the only thread which calls this method) is in synchronized
-        #      state 7. In this case, here doesn't have to broadcast.
-        #
-        return
-      end
-
-      ## synchronized state 7
-
-      begin
+      @mutex.synchronize do
+        @queue << sig
         @cond.broadcast
-      ensure
-        @mutex.unlock
       end
     end
 

data/lib/serverengine/version.rb

@@ -1,3 +1,3 @@
 module ServerEngine
-  VERSION = "1.5.3"
+  VERSION = "1.5.4"
 end

data/spec/blocking_flag_spec.rb

@@ -44,6 +44,7 @@ describe ServerEngine::BlockingFlag do
     started = BlockingFlag.new
     t = Thread.new do
       started.set!
+      Thread.pass
       subject.wait_for_set(1)
       elapsed = Time.now - start
     end

data/spec/server_worker_context.rb

@@ -1,32 +1,39 @@
 
-require 'pstore'
+require 'thread'
+require 'yaml'
 
 def reset_test_state
   FileUtils.mkdir_p 'tmp'
-  FileUtils.rm_f 'tmp/state.pstore'
-  FileUtils.touch 'tmp/state.pstore'
+  FileUtils.rm_f 'tmp/state.yml'
+  FileUtils.touch 'tmp/state.yml'
+  $state_file_mutex = Mutex.new
 end
 
 def incr_test_state(key)
-  ps = PStore.new('tmp/state.pstore')
-  ps.transaction do
-    ps[key] ||= 0
-    ps[key] += 1
+  File.open('tmp/state.yml', 'r+') do |f|
+    f.flock(File::LOCK_EX)
+
+    $state_file_mutex.synchronize do
+      data = YAML.load(f.read) || {} rescue {}
+      data[key] ||= 0
+      data[key] += 1
+
+      f.pos = 0
+      f.write YAML.dump(data)
+    end
   end
 end
 
 def test_state(key)
-  ps = PStore.new('tmp/state.pstore')
-  ps.transaction do
-    return ps[key] || 0
-  end
+  data = YAML.load_file('tmp/state.yml') || {} rescue {}
+  return data[key] || 0
 end
 
 shared_context 'test server and worker' do
   before { reset_test_state }
 
   def wait_for_fork
-    sleep 0.2
+    sleep 0.8
   end
 
   def wait_for_stop
@@ -97,7 +104,11 @@ shared_context 'test server and worker' do
 
     def run
       incr_test_state :worker_run
-      @stop_flag.wait(5.0)
+      5.times do
+        # repeats 5 times because signal handlers
+        # interrupts wait
+        @stop_flag.wait(5.0)
+      end
       @stop_flag.reset!
     end
 

data/spec/signal_thread_spec.rb

@@ -14,6 +14,7 @@ describe ServerEngine::SignalThread do
     end
 
     Process.kill('CONT', Process.pid)
+    sleep 0.5
 
     t.stop.join
 
@@ -43,8 +44,7 @@ describe ServerEngine::SignalThread do
     end
 
     Process.kill('QUIT', Process.pid)
-
-    sleep 1
+    sleep 0.5
 
     n.should == 3
   end
@@ -57,6 +57,7 @@ describe ServerEngine::SignalThread do
     end
 
     Process.kill('QUIT', Process.pid)
+    sleep 0.5
 
     t.join
   end

data/spec/supervisor_spec.rb

@@ -53,6 +53,7 @@ describe ServerEngine::Supervisor do
       wait_for_fork
 
       sv.restart(true)
+      wait_for_stop
 
     ensure
       sv.stop(true)
@@ -74,6 +75,7 @@ describe ServerEngine::Supervisor do
       wait_for_fork
 
       sv.restart(false)
+      wait_for_stop
 
     ensure
       sv.stop(true)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: serverengine
 version: !ruby/object:Gem::Version
-  version: 1.5.3
+  version: 1.5.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-01 00:00:00.000000000 Z
+date: 2013-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sigdump