serverengine 2.2.3 → 2.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c37776b7f6420e895262df160ce7156bf00b6c3adaccd8af016e2d35c2d49f28
-  data.tar.gz: 7109cb65899f1afd047c3a6ddce8dee6b51dcbf69d1c7bc0ef80937214a90850
+  metadata.gz: f04e7c4dc99fb0496568579a6516ac6df8bdae3d5c8927aa9586ff3fa530876d
+  data.tar.gz: fcdc7828debe292af0950c9f3d3c8947c05733d3e338449667fe4b057e425c5b
 SHA512:
-  metadata.gz: f92e476daba00bad71a9de2bb924187926bcc071266b510cba15741f584a3d14333d28533c9530d48f8b9820bd1fb9522bd1bfa5f3c1c858f238f44042a803cd
-  data.tar.gz: 0bd8378d0840b3ca89bae30999317925f9e3155d9c37fb3a9d5482c95f1be0350fa60b82c8d0706d5cdea40573f5bdf2801d4717f55b22da32469177895c15b5
+  metadata.gz: 1dc366572a0df514840c8e5f74bacf1d801f86f402de15c125006d332e256be1239e91991ce02aaad82be9b0ec45eb0305c7792e39b1d666edb674671c533761
+  data.tar.gz: c45dd0d66fe2c55e9cb71bdf930db49f33abcd08d14071aa5bb130d0119e1828691c2d6aab9372538c24b3d784dee767c625f7b2348cd03b525b1338970a32c3

data/.github/workflows/linux.yml

@@ -0,0 +1,26 @@
+name: Testing on Ubuntu
+on:
+  - push
+  - pull_request
+jobs:
+  build:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby: [ '3.0', '2.7', '2.6', '2.5' ]
+        os:
+          - ubuntu-latest
+    name: Ruby ${{ matrix.ruby }} unit testing on ${{ matrix.os }}
+    steps:
+    - uses: actions/checkout@v2
+    - uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby }}
+    - name: unit testing
+      env:
+        CI: true
+      run: |
+        gem install bundler rake
+        bundle install --jobs 4 --retry 3
+        bundle exec rake spec

data/Changelog

@@ -1,3 +1,7 @@
+2021-05-24 version 2.2.4:
+
+* Ensure to get correct Win32 socket error on Ruby 3.0
+
 2021-02-17 version 2.2.3:
 
 * Change SocketManager's port assignment strategy on Windows

data/NOTICE

@@ -1,3 +1,3 @@
 ServerEngine
-https://github.com/frsyuki/serverengine
+https://github.com/treasure-data/serverengine
 Copyright (C) 2012-2013 Sadayuki Furuhashi

data/appveyor.yml

@@ -1,4 +1,6 @@
 ---
+image: Visual Studio 2019
+
 install:
   - SET PATH=C:\Ruby%ruby_version%\bin;%PATH%
   - ruby --version
@@ -6,19 +8,28 @@ install:
   - bundle install
 build: off
 test_script:
-  - bundle exec rake -rdevkit
+  - bundle exec rake spec
 
 environment:
   matrix:
-    - ruby_version: "23-x64"
-      devkit: C:\Ruby23-x64\DevKit
-    - ruby_version: "23"
-      devkit: C:\Ruby23\DevKit
-    - ruby_version: "22-x64"
-      devkit: C:\Ruby23-x64\DevKit
-    - ruby_version: "22"
-      devkit: C:\Ruby23\DevKit
-    - ruby_version: "21-x64"
-      devkit: C:\Ruby23-x64\DevKit
-    - ruby_version: "21"
-      devkit: C:\Ruby23\DevKit
+    - ruby_version: "30-x64"
+    - ruby_version: "27-x64"
+    - ruby_version: "26-x64"
+    - ruby_version: "25-x64"
+
+# On Ruby 3.0, we need to use fiddle 1.0.8 or later to retrieve correct
+# error code. In addition, we have to specify the path of fiddle by RUBYLIB
+# because RubyInstaller loads Ruby's bundled fiddle before initializing gem.
+# See also:
+# * https://github.com/ruby/fiddle/issues/72
+# * https://bugs.ruby-lang.org/issues/17813
+# * https://github.com/oneclick/rubyinstaller2/blob/8225034c22152d8195bc0aabc42a956c79d6c712/lib/ruby_installer/build/dll_directory.rb
+for:
+-
+  matrix:
+    only:
+      - ruby_version: "30-x64"
+  test_script:
+    - gem install fiddle --version 1.0.8
+    - set RUBYLIB=C:/Ruby%ruby_version%/lib/ruby/gems/3.0.0/gems/fiddle-1.0.8/lib
+    - bundle exec rake spec

data/lib/serverengine/version.rb

@@ -1,3 +1,3 @@
 module ServerEngine
-  VERSION = "2.2.3"
+  VERSION = "2.2.4"
 end

data/lib/serverengine/winsock.rb

@@ -78,6 +78,19 @@ module ServerEngine
       end
     end
 
+    def self.last_error
+      # On Ruby 3.0 calling WSAGetLastError here can't retrieve correct error
+      # code because Ruby's internal code resets it.
+      # See also:
+      # * https://github.com/ruby/fiddle/issues/72
+      # * https://bugs.ruby-lang.org/issues/17813
+      if Fiddle.respond_to?(:win32_last_socket_error)
+        Fiddle.win32_last_socket_error || 0
+      else
+        self.WSAGetLastError
+      end
+    end
+
     INVALID_SOCKET = -1
   end
 
@@ -99,7 +112,7 @@ module ServerEngine
     extern "int rb_w32_map_errno(int)"
 
     def self.raise_last_error(name)
-      errno = rb_w32_map_errno(WinSock.WSAGetLastError)
+      errno = rb_w32_map_errno(WinSock.last_error)
       raise SystemCallError.new(name, errno)
     end
 

data/spec/blocking_flag_spec.rb

@@ -20,10 +20,16 @@ describe ServerEngine::BlockingFlag do
   it 'wait_for_set timeout' do
     start = Time.now
 
-    subject.wait_for_set(0.01)
+    subject.wait_for_set(0.1)
     elapsed = Time.now - start
 
-    elapsed.should >= 0.01
+    if ServerEngine.windows? && ENV['CI'] == 'True'
+      # timer seems low accuracy on Windows CI container, often a bit shorter
+      # than expected
+      elapsed.should >= 0.1 * 0.95
+    else
+      elapsed.should >= 0.1
+    end
   end
 
   it 'wait_for_reset timeout' do
@@ -31,10 +37,16 @@ describe ServerEngine::BlockingFlag do
 
     start = Time.now
 
-    subject.wait_for_reset(0.01)
+    subject.wait_for_reset(0.1)
     elapsed = Time.now - start
 
-    elapsed.should >= 0.01
+    if ServerEngine.windows? && ENV['CI'] == 'True'
+      # timer seems low accuracy on Windows CI container, often a bit shorter
+      # than expected
+      elapsed.should >= 0.1 * 0.95
+    else
+      elapsed.should >= 0.1
+    end
   end
 
   it 'wait' do

data/spec/server_worker_context.rb

@@ -254,7 +254,7 @@ shared_context 'test server and worker' do
   before { reset_test_state }
 
   def wait_for_fork
-    sleep 0.8
+    sleep 1.5
   end
 
   def wait_for_stop

data/spec/supervisor_spec.rb

@@ -191,7 +191,7 @@ describe ServerEngine::Supervisor do
         sv, t = start_supervisor(RunErrorWorker, server_restart_wait: 1, command_sender: sender)
 
         begin
-          sleep 2.2
+          sleep 2.5
         ensure
           sv.stop(true)
           t.join

data/spec/winsock_spec.rb

@@ -0,0 +1,18 @@
+require 'windows/error' if ServerEngine.windows?
+
+describe ServerEngine::WinSock do
+  # On Ruby 3.0, you need to use fiddle 1.0.8 or later to retrieve a correct
+  # error code. In addition, you need to specify the path of fiddle by RUBYLIB
+  # or `ruby -I` when you use RubyInstaller because it loads Ruby's bundled
+  # fiddle before initializing gem.
+  # See also:
+  # * https://github.com/ruby/fiddle/issues/72
+  # * https://bugs.ruby-lang.org/issues/17813
+  # * https://github.com/oneclick/rubyinstaller2/blob/8225034c22152d8195bc0aabc42a956c79d6c712/lib/ruby_installer/build/dll_directory.rb
+  context 'last_error' do
+    it 'bind error' do
+      expect(WinSock.bind(0, nil, 0)).to be -1
+      expect(WinSock.last_error).to be Windows::Error::WSAENOTSOCK
+    end
+  end
+end if ServerEngine.windows?

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: serverengine
 version: !ruby/object:Gem::Version
-  version: 2.2.3
+  version: 2.2.4
 platform: ruby
 authors:
 - Sadayuki Furuhashi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-02-17 00:00:00.000000000 Z
+date: 2021-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sigdump
@@ -87,9 +87,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/linux.yml"
 - ".gitignore"
 - ".rspec"
-- ".travis.yml"
 - Changelog
 - Gemfile
 - LICENSE
@@ -134,6 +134,7 @@ files:
 - spec/socket_manager_spec.rb
 - spec/spec_helper.rb
 - spec/supervisor_spec.rb
+- spec/winsock_spec.rb
 homepage: https://github.com/fluent/serverengine
 licenses:
 - Apache 2.0
@@ -153,7 +154,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.2.5
 signing_key: 
 specification_version: 4
 summary: ServerEngine - multiprocess server framework
@@ -168,3 +169,4 @@ test_files:
 - spec/socket_manager_spec.rb
 - spec/spec_helper.rb
 - spec/supervisor_spec.rb
+- spec/winsock_spec.rb

data/.travis.yml

@@ -1,21 +0,0 @@
-language: ruby
-
-rvm:
-  - 2.4.9
-  - 2.5.7
-  - 2.6.5
-  - 2.7
-  - ruby-head
-
-branches:
-  only:
-    - master
-
-script: bundle exec rake spec
-
-before_install:
- - gem update bundler
-
-matrix:
-  allow_failures:
-    - rvm: ruby-head