serverengine 1.6.3 → 1.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 27ee21f3ac6b04119621a1ccafc43da3a285465a
-  data.tar.gz: 2f145a46ec4de7b4034e807458813b8def7f8de8
+  metadata.gz: e1905531d61188949bea25a5bd1aa56882b9fd0e
+  data.tar.gz: 225c5c5204167c726710c4790def2f5b7794e179
 SHA512:
-  metadata.gz: 5b88fe6bcebd72115a8d9c4c58296a831e39625fc763e2ed09a359674dfe1d849fa1ab7c14d732870bfd6b67183dccdc9acf72f2d1506c7bd8675a708376ebd6
-  data.tar.gz: e660e7a7900db257d0022e441cc414bbbd0c6388a3f05c35b51190c1c1e14cbe5e9d84660cc957cef52c4f9c348e6d38e4c9608f2cff35260ff1c93ae4585c97
+  metadata.gz: c2a704566a28f1e90f44934d97e976e82aee1d6867b77bc6497b015c38fef2f538583bb614bdef18de91061b9e1927aa864c7eb50e5e1b0448f8b73eeb4293b6
+  data.tar.gz: c5bab7f53971af7eeaeb4a0a7a58bab5c921d6d39d2c0e00ea154c6cedce39ebe23bf675f8f31896d0dc5fed3b36b218d1e8e079402c97e1d86894dd0448b2a1

data/.travis.yml

@@ -1,6 +1,7 @@
 language: ruby
 
 rvm:
+  - 2.1.10
   - 2.2.4
   - 2.3.0
   - ruby-head

data/Changelog

@@ -1,3 +1,9 @@
+2016-05-19 version 1.6.4:
+
+* Refactor to delete some warnings
+* Fix infinite self call bug in SignalTread
+* Add ruby 2.1 support for TravisCI
+
 2016-04-27 version 1.6.3:
 
 * Fix Socket Manager for UDP to adapt to ipv6

data/lib/serverengine/config_loader.rb

@@ -29,6 +29,8 @@ module ServerEngine
         end
       end
 
+      @logger = nil
+
       reload_config
     end
 

data/lib/serverengine/daemon.rb

@@ -31,8 +31,8 @@ module ServerEngine
       @daemonize = @config.fetch(:daemonize, false)
 
       if @config.fetch(:supervisor, false)
-        @create_server_proc = lambda do |load_config_proc,logger|
-          s = Supervisor.new(server_module, worker_module, load_config_proc)
+        @create_server_proc = lambda do |_load_config_proc,logger|
+          s = Supervisor.new(server_module, worker_module, _load_config_proc)
           s.logger = logger
           s
         end

data/lib/serverengine/daemon_logger.rb

@@ -32,6 +32,7 @@ module ServerEngine
     def initialize(logdev, config={})
       @rotate_age = config[:log_rotate_age] || 5
       @rotate_size = config[:log_rotate_size] || 1048576
+      @file_dev = nil
 
       if RUBY_VERSION < "2.1.0"
         # Ruby < 2.1.0 has a problem around log rotation with multiprocess:

data/lib/serverengine/signal_thread.rb

@@ -54,7 +54,7 @@ module ServerEngine
     end
 
     def handlers
-      handlers.dup
+      @handlers.dup
     end
 
     def stop

data/lib/serverengine/supervisor.rb

@@ -149,7 +149,7 @@ module ServerEngine
       while true
         # keep the child process alive in this loop
         until @detach_flag.wait(0.5)
-          if stat = try_join
+          if try_join
             return if @stop   # supervisor stoppped explicitly
 
             # child process died unexpectedly.

data/lib/serverengine/version.rb

@@ -1,3 +1,3 @@
 module ServerEngine
-  VERSION = "1.6.3"
+  VERSION = "1.6.4"
 end

data/spec/server_worker_context.rb

@@ -29,101 +29,100 @@ def test_state(key)
   return data[key] || 0
 end
 
-shared_context 'test server and worker' do
-  before { reset_test_state }
-
-  def wait_for_fork
-    sleep 0.8
+module TestServer
+  def initialize
+    incr_test_state :server_initialize
   end
 
-  def wait_for_stop
-    sleep 0.8
+  def before_run
+    incr_test_state :server_before_run
   end
 
-  def wait_for_restart
-    sleep 1.5
+  def after_run
+    incr_test_state :server_after_run
   end
 
-  module TestServer
-    def initialize
-      incr_test_state :server_initialize
-    end
+  def after_start
+    incr_test_state :server_after_start
+  end
 
-    def before_run
-      incr_test_state :server_before_run
+  def stop(stop_graceful)
+    incr_test_state :server_stop
+    if stop_graceful
+      incr_test_state :server_stop_graceful
+    else
+      incr_test_state :server_stop_immediate
     end
+    super
+  end
 
-    def after_run
-      incr_test_state :server_after_run
+  def restart(stop_graceful)
+    incr_test_state :server_restart
+    if stop_graceful
+      incr_test_state :server_restart_graceful
+    else
+      incr_test_state :server_restart_immediate
     end
+    super
+  end
 
-    def after_start
-      incr_test_state :server_after_start
-    end
+  def reload
+    incr_test_state :server_reload
+    super
+  end
 
-    def stop(stop_graceful)
-      incr_test_state :server_stop
-      if stop_graceful
-        incr_test_state :server_stop_graceful
-      else
-        incr_test_state :server_stop_immediate
-      end
-      super
-    end
+  def detach
+    incr_test_state :server_detach
+    super
+  end
+end
 
-    def restart(stop_graceful)
-      incr_test_state :server_restart
-      if stop_graceful
-        incr_test_state :server_restart_graceful
-      else
-        incr_test_state :server_restart_immediate
-      end
-      super
-    end
+module TestWorker
+  def initialize
+    incr_test_state :worker_initialize
+    @stop_flag = BlockingFlag.new
+  end
 
-    def reload
-      incr_test_state :server_reload
-      super
-    end
+  def before_fork
+    incr_test_state :worker_before_fork
+  end
 
-    def detach
-      incr_test_state :server_detach
-      super
+  def run
+    incr_test_state :worker_run
+    5.times do
+      # repeats 5 times because signal handlers
+      # interrupts wait
+      @stop_flag.wait(5.0)
     end
+    @stop_flag.reset!
   end
 
-  module TestWorker
-    def initialize
-      incr_test_state :worker_initialize
-      @stop_flag = BlockingFlag.new
-    end
+  def stop
+    incr_test_state :worker_stop
+    @stop_flag.set!
+  end
 
-    def before_fork
-      incr_test_state :worker_before_fork
-    end
+  def reload
+    incr_test_state :worker_reload
+  end
 
-    def run
-      incr_test_state :worker_run
-      5.times do
-        # repeats 5 times because signal handlers
-        # interrupts wait
-        @stop_flag.wait(5.0)
-      end
-      @stop_flag.reset!
-    end
+  def after_start
+    incr_test_state :worker_after_start
+  end
+end
 
-    def stop
-      incr_test_state :worker_stop
-      @stop_flag.set!
-    end
+shared_context 'test server and worker' do
+  before { reset_test_state }
 
-    def reload
-      incr_test_state :worker_reload
-    end
+  def wait_for_fork
+    sleep 0.8
+  end
 
-    def after_start
-      incr_test_state :worker_after_start
-    end
+  def wait_for_stop
+    sleep 0.8
   end
 
+  def wait_for_restart
+    sleep 1.5
+  end
 end

data/spec/signal_thread_spec.rb

@@ -39,7 +39,7 @@ describe ServerEngine::SignalThread do
   it 'signal in handler' do
     n = 0
 
-    t = SignalThread.new do |st|
+    SignalThread.new do |st|
       st.trap('QUIT') do
         if n < 3
           Process.kill('QUIT', Process.pid)
@@ -55,8 +55,6 @@ describe ServerEngine::SignalThread do
   end
 
   it 'stop in handler' do
-    n = 0
-
     t = SignalThread.new do |st|
       st.trap('QUIT') { st.stop }
     end
@@ -70,7 +68,7 @@ describe ServerEngine::SignalThread do
   it 'should not deadlock' do
     n = 0
 
-    t = SignalThread.new do |st|
+    SignalThread.new do |st|
       st.trap('CONT') { n += 1 }
     end
 

data/spec/socket_manager_spec.rb

@@ -7,7 +7,7 @@ describe ServerEngine::SocketManager do
   end
 
   after(:each) do
-    File.unlink(server_path) if File.exists?(server_path)
+    File.unlink(server_path) if File.exist?(server_path)
   end
 
   if ServerEngine.windows?
@@ -37,7 +37,7 @@ describe ServerEngine::SocketManager do
           incr_test_state(:is_tcp_server) if tcp.is_a?(TCPServer)
           incr_test_state(:is_udp_socket) if udp.is_a?(UDPSocket)
 
-          data, from = udp.recvfrom(10)
+          data, _from = udp.recvfrom(10)
           incr_test_state(:udp_data_sent) if data == "ok"
 
           s = tcp.accept
@@ -89,7 +89,7 @@ describe ServerEngine::SocketManager do
           incr_test_state(:is_tcp_server) if tcp.is_a?(TCPServer)
           incr_test_state(:is_udp_socket) if udp.is_a?(UDPSocket)
 
-          data, from = udp.recvfrom(10)
+          data, _from = udp.recvfrom(10)
           incr_test_state(:udp_data_sent) if data == "ok"
 
           s = tcp.accept

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: serverengine
 version: !ruby/object:Gem::Version
-  version: 1.6.3
+  version: 1.6.4
 platform: ruby
 authors:
 - Sadayuki Furuhashi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-27 00:00:00.000000000 Z
+date: 2016-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sigdump
@@ -120,7 +120,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: ServerEngine - multiprocess server framework