fluentd 1.16.8 → 1.16.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 39cbd3cc9d1a6daf0c50069afb00d256a8a2452438bdd01a16b3412dd69ebb75
-  data.tar.gz: 4c6eef69a1c7d3f617b5247be20ee07d34d9040b71b0f9aa908ad60cd236d844
+  metadata.gz: 93691593c92aeca335e74f4c4bf3b1595655c97fc194b46c4ece5387201d9f05
+  data.tar.gz: 83202ec05f5d4a7139edcabfc0be8134394216710402183bda98ab0b6e3f88d0
 SHA512:
-  metadata.gz: 2662046c8e8463f1b3b3bf05cd0a43d0401cebd29ea81cc9a5537a32ccb6b857e9f7e7d0dd76a430a463dbd7e2b144e635064ce2f9b23405e121e3514450b760
-  data.tar.gz: e8c1e4a852ef1f0f13364ef1ee6f31c3c917f4cd448e2dd7102ae76420a9700c6794aabc9a44df0c96f5b1b353a1ddeea0b210bd22358af57e71f4dc8b2aa9ab
+  metadata.gz: 912df889d8a361269285bb48d7b05ef910de2196d87ddf49f93bb026a2b65c2e158ce252cf13ba5280a14817012704021fabdb71b6e68d05b4ec19bde9727a8c
+  data.tar.gz: e44d5fd2b8a7561dc7c81d2ad48cd4490457340065ec3d852aaf84444e68f7b323355bc39438814ecb6e3f0a1120c7caac4fa9738bcf3791286e43fdba37bfe8

data/.github/workflows/test.yml

@@ -16,6 +16,8 @@ concurrency:
   group: ${{ github.head_ref || github.sha }}-${{ github.workflow }}
   cancel-in-progress: true
 
+permissions: read-all
+
 jobs:
   test:
     runs-on: ${{ matrix.os }}
@@ -25,7 +27,6 @@ jobs:
       matrix:
         os: ['ubuntu-latest', 'macos-latest', 'windows-latest']
         ruby-version: ['3.3', '3.2', '3.1', '3.0', '2.7']
-
     name: Ruby ${{ matrix.ruby-version }} on ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v3
@@ -41,3 +42,23 @@ jobs:
         run: bundle install
       - name: Run tests
         run: bundle exec rake test TESTOPTS="-v --no-show-detail-immediately"
+
+  test-windows-service:
+    runs-on: windows-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby-version: ['3.3', '3.2', '3.1', '3.0', '2.7']
+    name: Windows service (Ruby ${{ matrix.ruby-version }})
+    steps:
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@e34163cd15f4bb403dcd72d98e295997e6a55798 # v1.238.0
+        with:
+          ruby-version: ${{ matrix.ruby-version }}
+      - name: Install dependencies
+        run: |
+          bundle install
+          rake install
+      - name: Run tests
+        run: test\scripts\windows_service_test.ps1

data/CHANGELOG.md

@@ -1,7 +1,23 @@
 # v1.16
 
+## Release v1.16.9 - 2025/05/14
+
+### Bug Fix
+
+* winsvc: Fix bug where service accidentally stops after starting.
+  The previous version (v1.16.8) should not be used for Windows Service.
+  https://github.com/fluent/fluentd/pull/4955
+
+### Misc
+
+* CI improvemnts
+  https://github.com/fluent/fluentd/pull/4956
+
 ## Release v1.16.8 - 2025/05/01
 
+**This version has a critical bug about Windows Service. Do not use this version.**
+(https://github.com/fluent/fluentd/pull/4955)
+
 ### Bug Fix
 
 * winsvc: Stop the service when the supervisor is dead

data/lib/fluent/version.rb

@@ -16,6 +16,6 @@
 
 module Fluent
 
-  VERSION = '1.16.8'
+  VERSION = '1.16.9'
 
 end

data/lib/fluent/winsvc.rb

@@ -63,7 +63,7 @@ begin
         loop do
           sleep 5
           break unless running?
-          raise Errno::ECHILD unless Process.waitpid2(@pid, Process::WNOHANG)
+          raise Errno::ECHILD if Process.waitpid(@pid, Process::WNOHANG)
         end
       rescue Errno::ECHILD
         @pid = 0

data/test/scripts/windows_service_test.ps1

@@ -0,0 +1,73 @@
+$ErrorActionPreference = "Stop"
+Set-PSDebug -Trace 1
+
+$default_conf_path = (Resolve-Path fluent.conf).Path
+$current_path = (Get-Location).Path
+$log_path = "$current_path/fluentd.log"
+
+ruby bin/fluentd --reg-winsvc i --reg-winsvc-fluentdopt "-c '$default_conf_path' -o '$log_path'"
+
+# Test: must not start automatically
+if ((Get-Service fluentdwinsvc).Status -ne "Stopped") {
+    Write-Error "The service should not start automatically."
+}
+
+Start-Service fluentdwinsvc
+Start-Sleep 30
+
+# Test: the service should be running after started
+if ((Get-Service fluentdwinsvc).Status -ne "Running") {
+    Write-Error "The service should be running after started."
+}
+
+# Test: no warn/error/fatal logs
+Get-ChildItem "*.log" | %{
+    Get-Content $_
+    if (Select-String -Path $_ -Pattern "[warn]", "[error]", "[fatal]" -SimpleMatch -Quiet) {
+        Select-String -Path $_ -Pattern "[warn]", "[error]", "[fatal]" -SimpleMatch
+        Write-Error "There are abnormal level logs in ${_}:"
+    }
+}
+
+Stop-Service fluentdwinsvc
+Start-Sleep 10 # Somehow it is possible that some processes stay alive for a while. (This could be not good behavior...)
+
+# Test: status after stopped
+if ((Get-Service fluentdwinsvc).Status -ne "Stopped") {
+    Write-Error "The service should be in 'Stopped' status after stopped."
+}
+# Test: all Ruby processes should stop
+$ruby_processes = Get-Process -name ruby -ErrorAction SilentlyContinue
+if ($ruby_processes.Count -ne 0) {
+    Write-Output $ruby_processes
+    Write-Error "All Ruby processes should stop."
+}
+
+# Test: service should stop when the supervisor fails to launch
+# https://github.com/fluent/fluentd/pull/4909
+$test_setting = @'
+<source>
+  @type sample
+  @id DUPLICATED_ID
+  tag test
+</source>
+<match test>
+  @type stdout
+  @id DUPLICATED_ID
+</match>
+'@
+Add-Content -Path "duplicated_id.conf" -Encoding UTF8 -Value $test_setting
+ruby bin/fluentd --reg-winsvc-fluentdopt "-c '$current_path/duplicated_id.conf' -o '$log_path'"
+Start-Service fluentdwinsvc
+Start-Sleep 30
+if ((Get-Service fluentdwinsvc).Status -ne "Stopped") {
+    Write-Error "The service should be in 'Stopped' status when the supervisor fails to launch."
+}
+$ruby_processes = Get-Process -name ruby -ErrorAction SilentlyContinue
+if ($ruby_processes.Count -ne 0) {
+    Write-Output $ruby_processes
+    Write-Error "All Ruby processes should stop."
+}
+
+ruby bin/fluentd --reg-winsvc u
+Remove-Item $log_path

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: fluentd
 version: !ruby/object:Gem::Version
-  version: 1.16.8
+  version: 1.16.9
 platform: ruby
 authors:
 - Sadayuki Furuhashi
-autorequire: 
 bindir: bin
 cert_chain: []
-date: 2025-05-01 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -931,6 +930,7 @@ files:
 - test/scripts/fluent/plugin/out_test.rb
 - test/scripts/fluent/plugin/out_test2.rb
 - test/scripts/fluent/plugin/parser_known.rb
+- test/scripts/windows_service_test.ps1
 - test/test_capability.rb
 - test/test_clock.rb
 - test/test_config.rb
@@ -969,7 +969,6 @@ homepage: https://www.fluentd.org/
 licenses:
 - Apache-2.0
 metadata: {}
-post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -984,8 +983,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.19
-signing_key: 
+rubygems_version: 3.6.8
 specification_version: 4
 summary: Fluentd event collector
 test_files:
@@ -1174,6 +1172,7 @@ test_files:
 - test/scripts/fluent/plugin/out_test.rb
 - test/scripts/fluent/plugin/out_test2.rb
 - test/scripts/fluent/plugin/parser_known.rb
+- test/scripts/windows_service_test.ps1
 - test/test_capability.rb
 - test/test_clock.rb
 - test/test_config.rb