serverengine 1.5.11 → 1.6.0

data/lib/serverengine/utils.rb

@@ -17,6 +17,13 @@
 #
 module ServerEngine
 
+  IS_WINDOWS = /mswin|mingw/ === RUBY_PLATFORM
+  private_constant :IS_WINDOWS
+
+  def self.windows?
+    IS_WINDOWS
+  end
+
   module ClassMethods
     def dump_uncaught_error(e)
       STDERR.write "Unexpected error #{e}\n"

data/lib/serverengine/version.rb

@@ -1,3 +1,3 @@
 module ServerEngine
-  VERSION = "1.5.11"
+  VERSION = "1.6.0"
 end

data/lib/serverengine/winsock.rb

@@ -0,0 +1,128 @@
+#
+# ServerEngine
+#
+# Copyright (C) 2012-2013 Sadayuki Furuhashi
+#
+#    Licensed under the Apache License, Version 2.0 (the "License");
+#    you may not use this file except in compliance with the License.
+#    You may obtain a copy of the License at
+#
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS,
+#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    See the License for the specific language governing permissions and
+#    limitations under the License.
+#
+module ServerEngine
+  module WinSock
+
+    require 'fiddle/import'
+    require 'fiddle/types'
+    require 'socket'
+
+    extend Fiddle::Importer
+
+    dlload "ws2_32.dll"
+    include Fiddle::Win32Types
+
+    extern "int WSASocketA(int, int, int, void *, int, DWORD)"
+    extern "long inet_addr(char *)"
+    extern "int bind(int, void *, int)"
+    extern "int listen(int, int)"
+    extern "int WSADuplicateSocketA(int, DWORD, void *)"
+    extern "int WSAGetLastError()"
+    extern "BOOL CloseHandle(int)"
+
+    SockaddrIn = struct(["short sin_family",
+                         "short sin_port",
+                         "long sin_addr",
+                         "char sin_zero[8]",
+                        ])
+
+    WSAPROTOCOL_INFO = struct(["DWORD dwServiceFlags1",
+                               "DWORD dwServiceFlags2",
+                               "DWORD dwServiceFlags3",
+                               "DWORD dwServiceFlags4",
+                               "DWORD dwProviderFlags",
+                               "DWORD Data1",
+                               "WORD  Data2",
+                               "WORD  Data3",
+                               "BYTE  Data4[8]",
+                               "DWORD dwCatalogEntryId",
+                               "int ChainLen",
+                               "DWORD ChainEntries[7]",
+                               "int iVersion",
+                               "int iAddressFamily",
+                               "int iMaxSockAddr",
+                               "int iMinSockAddr",
+                               "int iSocketType",
+                               "int iProtocol",
+                               "int iProtocolMaxOffset",
+                               "int iNetworkByteOrder",
+                               "int iSecurityScheme",
+                               "DWORD dwMessageSize",
+                               "DWORD dwProviderReserved",
+                               "char szProtocol[256]",
+                              ])
+
+    class WSAPROTOCOL_INFO
+      def self.from_bin(bin)
+        proto = malloc
+        proto.to_ptr.ref.ptr[0, size] = bin
+        proto
+      end
+
+      def to_bin
+        to_ptr.to_s
+      end
+    end
+
+    INVALID_SOCKET = -1
+  end
+
+  module RbWinSock
+    extend Fiddle::Importer
+
+    dlload "kernel32"
+    extern "int GetModuleFileNameA(int, char *, int)"
+
+    ruby_bin_path_buf = Fiddle::Pointer.malloc(1000)
+    GetModuleFileNameA(0, ruby_bin_path_buf, ruby_bin_path_buf.size)
+
+    ruby_bin_path = ruby_bin_path_buf.to_s.gsub(/\\/, '/')
+    ruby_dll_paths = File.dirname(ruby_bin_path) + '/msvcr*ruby*.dll'
+    ruby_dll_path = Dir.glob(ruby_dll_paths).first
+    dlload ruby_dll_path
+
+    extern "int rb_w32_map_errno(int)"
+    extern "void rb_syserr_fail(int, char *)"
+
+    def self.raise_last_error(name)
+      errno = rb_w32_map_errno(WinSock.WSAGetLastError)
+      rb_syserr_fail(errno, name)
+    end
+
+    extern "int rb_w32_wrap_io_handle(int, int)"
+
+    def self.wrap_io_handle(sock_class, handle, flags)
+      begin
+        fd = rb_w32_wrap_io_handle(handle, flags)
+        if fd < 0
+          raise_last_error("rb_w32_wrap_io_handle(3)")
+        end
+
+        sock = sock_class.for_fd(fd)
+        wrapped = true
+        sock.define_singleton_method(:handle) { handle }
+
+        return sock
+      ensure
+        unless wrapped
+          WinSock.CloseHandle(handle)
+        end
+      end
+    end
+  end
+end

data/lib/serverengine.rb

@@ -35,6 +35,7 @@ module ServerEngine
     :MultiThreadServer => 'serverengine/multi_thread_server',
     :MultiSpawnServer => 'serverengine/multi_spawn_server',
     :ProcessManager => 'serverengine/process_manager',
+    :SocketManager => 'serverengine/socket_manager',
     :Worker => 'serverengine/worker',
     :VERSION => 'serverengine/version',
   }.each_pair {|k,v|

data/spec/signal_thread_spec.rb

@@ -22,13 +22,18 @@ describe ServerEngine::SignalThread do
   end
 
   it 'SIG_IGN' do
-    t = SignalThread.new do |st|
-      st.trap('QUIT', 'SIG_IGN')
-    end
+    # IGNORE signal handler has possible race condition in Ruby 2.1
+    # https://bugs.ruby-lang.org/issues/9835
+    # That's why ignore this test in Ruby2.1
+    if RUBY_VERSION >= '2.2'
+      t = SignalThread.new do |st|
+        st.trap('QUIT', 'SIG_IGN')
+      end
 
-    Process.kill('QUIT', Process.pid)
+      Process.kill('QUIT', Process.pid)
 
-    t.stop.join
+      t.stop.join
+    end
   end
 
   it 'signal in handler' do

data/spec/socket_manager_spec.rb

@@ -0,0 +1,115 @@
+
+describe ServerEngine::SocketManager do
+  include_context 'test server and worker'
+
+  let(:server_path) do
+    'tmp/socket_manager_test.sock'
+  end
+
+  after(:each) do
+    File.unlink(server_path) if File.exists?(server_path)
+  end
+
+  if ServerEngine.windows?
+    let(:server_port) do
+     24223
+    end
+
+    let(:test_port) do
+      9101
+    end
+
+    it 'is windows' do
+      SocketManager::Client.is_a?(SocketManagerWin::ClientModule)
+      SocketManager::Server.is_a?(SocketManagerWin::ServerModule)
+    end
+
+    context 'with thread' do
+      it 'works' do
+        server = SocketManager::Server.open(server_port)
+
+        thread = Thread.new do
+
+          client = ServerEngine::SocketManager::Client.new(server_port)
+          tcp = client.listen_tcp('127.0.0.1', test_port)
+          udp = client.listen_udp('127.0.0.1', test_port)
+
+          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)
+          incr_test_state(:udp_data_sent) if data == "ok"
+
+          s = tcp.accept
+          s.write("ok")
+          s.close
+        end
+
+        sleep 1
+
+        u = UDPSocket.new
+        u.send "ok", 0, '127.0.0.1', test_port
+        u.close
+
+        t = TCPSocket.open('127.0.0.1', test_port)
+        t.read.should == "ok"
+        t.close
+
+        server.close
+        thread.join
+
+        test_state(:is_tcp_server).should == 1
+        test_state(:is_udp_socket).should == 1
+        test_state(:udp_data_sent).should == 1
+      end
+    end
+
+  else
+    it 'is unix' do
+      SocketManager::Client.is_a?(SocketManagerUnix::ClientModule)
+      SocketManager::Server.is_a?(SocketManagerUnix::ServerModule)
+    end
+
+    context 'with fork' do
+      it 'works' do
+        server = SocketManager::Server.open(server_path)
+
+        fork do
+          server.close
+
+          client = server.new_client
+
+          tcp = client.listen_tcp('127.0.0.1', test_port)
+          udp = client.listen_udp('127.0.0.1', test_port)
+
+          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)
+          incr_test_state(:udp_data_sent) if data == "ok"
+
+          s = tcp.accept
+          s.write("ok")
+          s.close
+        end
+
+        wait_for_fork
+
+        u = UDPSocket.new
+        u.send "ok", 0, '127.0.0.1', test_port
+        u.close
+
+        t = TCPSocket.open('127.0.0.1', test_port)
+        t.read.should == "ok"
+        t.close
+
+        server.close
+
+        test_state(:is_tcp_server).should == 1
+        test_state(:is_udp_socket).should == 1
+        test_state(:udp_data_sent).should == 1
+      end
+    end
+  end
+
+end

data/spec/spec_helper.rb

@@ -1,5 +1,4 @@
 require 'bundler'
-require 'sigdump/setup'
 
 begin
   Bundler.setup(:default, :test)
@@ -12,5 +11,9 @@ end
 require 'serverengine'
 include ServerEngine
 
+# require sigdump only in unix, because there is no suport for SIGCONT in windows.
+unless ServerEngine.windows?
+  require 'sigdump/setup'
+end
 require 'server_worker_context'
 

data/spec/supervisor_spec.rb

@@ -9,6 +9,63 @@ describe ServerEngine::Supervisor do
     return sv, t
   end
 
+  def start_daemon(config={})
+    daemon = Daemon.new(nil, TestWorker, config)
+    t = Thread.new { daemon.main }
+
+    return daemon, t
+  end
+
+  context 'when :log=IO option is given' do
+    it 'can start' do
+      daemon, t = start_daemon(log: STDOUT)
+
+      begin
+        wait_for_fork
+      ensure
+        daemon.server.stop(true)
+        t.join
+      end
+
+      test_state(:worker_run).should == 1
+      daemon.server.logger.should be_an_instance_of(ServerEngine::DaemonLogger)
+    end
+  end
+
+  context 'when :logger option is given' do
+    it 'uses specified logger instance' do
+      logger = ServerEngine::DaemonLogger.new(STDOUT)
+      daemon, t = start_daemon(logger: logger)
+
+      begin
+        wait_for_fork
+      ensure
+        daemon.server.stop(true)
+        t.join
+      end
+
+      test_state(:worker_run).should == 1
+      daemon.server.logger.should == logger
+    end
+  end
+
+  context 'when both :logger and :log options are given' do
+    it 'start ignoring :log' do
+      logger = ServerEngine::DaemonLogger.new(STDOUT)
+      daemon, t = start_daemon(logger: logger, log: STDERR)
+
+      begin
+        wait_for_fork
+      ensure
+        daemon.server.stop(true)
+        t.join
+      end
+
+      test_state(:worker_run).should == 1
+      daemon.server.logger.should == logger
+    end
+  end
+
   it 'start and graceful stop' do
     sv, t = start_supervisor
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: serverengine
 version: !ruby/object:Gem::Version
-  version: 1.5.11
+  version: 1.6.0
 platform: ruby
 authors:
 - Sadayuki Furuhashi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-28 00:00:00.000000000 Z
+date: 2016-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sigdump
@@ -68,6 +68,7 @@ files:
 - NOTICE
 - README.md
 - Rakefile
+- appveyor.yml
 - lib/serverengine.rb
 - lib/serverengine/blocking_flag.rb
 - lib/serverengine/config_loader.rb
@@ -81,9 +82,13 @@ files:
 - lib/serverengine/process_manager.rb
 - lib/serverengine/server.rb
 - lib/serverengine/signal_thread.rb
+- lib/serverengine/socket_manager.rb
+- lib/serverengine/socket_manager_unix.rb
+- lib/serverengine/socket_manager_win.rb
 - lib/serverengine/supervisor.rb
 - lib/serverengine/utils.rb
 - lib/serverengine/version.rb
+- lib/serverengine/winsock.rb
 - lib/serverengine/worker.rb
 - serverengine.gemspec
 - spec/blocking_flag_spec.rb
@@ -92,6 +97,7 @@ files:
 - spec/multi_process_server_spec.rb
 - spec/server_worker_context.rb
 - spec/signal_thread_spec.rb
+- spec/socket_manager_spec.rb
 - spec/spec_helper.rb
 - spec/supervisor_spec.rb
 homepage: https://github.com/fluent/serverengine
@@ -114,7 +120,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.3
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: ServerEngine - multiprocess server framework
@@ -125,5 +131,6 @@ test_files:
 - spec/multi_process_server_spec.rb
 - spec/server_worker_context.rb
 - spec/signal_thread_spec.rb
+- spec/socket_manager_spec.rb
 - spec/spec_helper.rb
 - spec/supervisor_spec.rb