serverengine 2.2.4-x64-mingw32 → 2.2.5-x64-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 40f46b384c30ca1948b502b420f3b53d92c296936f5c91bd9430f781fac08939
-  data.tar.gz: 3932f03c87996232a7a58645a8c77ffb2f57302f49b62c1cd6bfc944ab3e9faa
+  metadata.gz: ddf19f396fc80de321872d09e66f801ee0551de356ed84825905468e0faad7f6
+  data.tar.gz: a603493e2e261de52879964a871a240499c9f8131c9f30ee78e3cd836a8484e5
 SHA512:
-  metadata.gz: 34ddd5a05ef2a9f1ab41642671b57ebb76d29f9363051173d3dfc82ea3c6d735493821429710e290191effb6e553d932b2ce2fa6c9a0d0d6f407362d52c30b25
-  data.tar.gz: 2982698d8a5762b8305f20d92f4e0d8766db9ee735a33a6a3b01c192414fd9a5f9492176e26afab848d9a986d35827cf4a84c14850f7094a69323b860d32bf60
+  metadata.gz: 31705167a6e0349a613a6234536c695b7825a2b526cc9c22a452bce9f9134373149000e7e8768561d1c61b2f4f350049b36a1c2396ac1b32237ac27ef6cbce1a
+  data.tar.gz: fa756ba5653d68631b8b6aaaf279e996fa7e3d1786ddd5f8c87bdae9f89dfd4519a0713aba73708de87afaa833b9187f5a779fa1fd6c907e5a79ef1b4ca40f6e

data/.github/workflows/linux.yml

@@ -1,26 +1,31 @@
 name: Testing on Ubuntu
 on:
-  - push
-  - pull_request
+  push:
+    branches: [master]
+  pull_request:
+    branches: [master]
+
 jobs:
-  build:
+  test:
     runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false
       matrix:
-        ruby: [ '3.0', '2.7', '2.6', '2.5' ]
+        ruby: [ '3.1', '3.0', '2.7', '2.6' ]
         os:
           - ubuntu-latest
-    name: Ruby ${{ matrix.ruby }} unit testing on ${{ matrix.os }}
+    name: Unit testing with Ruby ${{ matrix.ruby }} 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
+      - uses: actions/checkout@v2
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+      - name: Install dependencies
+        run: |
+          gem install bundler rake
+          bundle install --jobs 4 --retry 3
+      - name: Run tests
+        env:
+          CI: true
+        run: bundle exec rake spec

data/.github/workflows/windows.yml

@@ -0,0 +1,42 @@
+name: Testing on Windows
+on:
+  push:
+    branches: [master]
+  pull_request:
+    branches: [master]
+
+jobs:
+  test:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby: [ '3.1', '2.7', '2.6' ]
+        os:
+          - windows-latest
+        include:
+          - ruby: '3.0.3'
+            os: windows-latest
+            # 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
+            ruby-lib-opt: RUBYLIB=%RUNNER_TOOL_CACHE%/Ruby/3.0.3/x64/lib/ruby/gems/3.0.0/gems/fiddle-1.1.0/lib
+
+    name: Unit testing with Ruby ${{ matrix.ruby }} on ${{ matrix.os }}
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+      - name: Add Fiddle 1.1.0
+        if: ${{ matrix.ruby == '3.0.3' }}
+        run: gem install fiddle --version 1.1.0
+      - name: Install dependencies
+        run: ridk exec bundle install --jobs 4 --retry 3
+      - name: Run tests
+        run: bundle exec rake spec ${{ matrix.ruby-lib-opt }}

data/Changelog

@@ -1,3 +1,7 @@
+2022-01-13 version 2.2.5:
+
+* Fix DLL load error on Ruby 3.1 on Windows
+
 2021-05-24 version 2.2.4:
 
 * Ensure to get correct Win32 socket error on Ruby 3.0

data/lib/serverengine/multi_process_server.rb

@@ -142,7 +142,11 @@ module ServerEngine
         return false unless @pmon
 
         if stat = @pmon.try_join
-          @worker.logger.info "Worker #{@wid} finished#{@stop ? '' : ' unexpectedly'} with #{ServerEngine.format_join_status(stat)}"
+          if @stop
+            @worker.logger.info "Worker #{@wid} finished with #{ServerEngine.format_join_status(stat)}"
+          else
+            @worker.logger.error "Worker #{@wid} finished unexpectedly with #{ServerEngine.format_join_status(stat)}"
+          end
           if stat.is_a?(Process::Status) && stat.exited? && @unrecoverable_exit_codes.include?(stat.exitstatus)
             @unrecoverable_exit = true
             @exitstatus = stat.exitstatus

data/lib/serverengine/version.rb

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

data/lib/serverengine/winsock.rb

@@ -21,6 +21,7 @@ module ServerEngine
     require 'fiddle/import'
     require 'fiddle/types'
     require 'socket'
+    require 'rbconfig'
 
     extend Fiddle::Importer
 
@@ -101,14 +102,7 @@ module ServerEngine
     extern "int GetModuleFileNameA(int, char *, int)"
     extern "int CloseHandle(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
-
+    dlload RbConfig::CONFIG['LIBRUBY_SO']
     extern "int rb_w32_map_errno(int)"
 
     def self.raise_last_error(name)

data/spec/supervisor_spec.rb

@@ -197,7 +197,13 @@ describe ServerEngine::Supervisor do
           t.join
         end
 
-        test_state(:worker_run).should == 3
+        if ServerEngine.windows?
+          # Because launching a process on Windows is high cost,
+          # it doesn't often reach to 3.
+          test_state(:worker_run).should <= 3
+        else
+          test_state(:worker_run).should == 3
+        end
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: serverengine
 version: !ruby/object:Gem::Version
-  version: 2.2.4
+  version: 2.2.5
 platform: x64-mingw32
 authors:
 - Sadayuki Furuhashi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-05-24 00:00:00.000000000 Z
+date: 2022-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sigdump
@@ -102,6 +102,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".github/workflows/linux.yml"
+- ".github/workflows/windows.yml"
 - ".gitignore"
 - ".rspec"
 - Changelog
@@ -110,7 +111,6 @@ files:
 - NOTICE
 - README.md
 - Rakefile
-- appveyor.yml
 - examples/server.rb
 - examples/spawn_worker_script.rb
 - lib/serverengine.rb

data/appveyor.yml

@@ -1,35 +0,0 @@
----
-image: Visual Studio 2019
-
-install:
-  - SET PATH=C:\Ruby%ruby_version%\bin;%PATH%
-  - ruby --version
-  - gem --version
-  - bundle install
-build: off
-test_script:
-  - bundle exec rake spec
-
-environment:
-  matrix:
-    - 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