fluentd 1.16.8-x86-mingw32 → 1.16.9-x86-mingw32

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 0c5ae232fdfccc14424b4d022e8d3e4ca9bd05b3b7c8a8de10508263c6ea651c
4
- data.tar.gz: 60d0abe234b4493236956d88f63d5807c7124682dec6333d3966148f66efa1dc
3
+ metadata.gz: c11a0c381dfd7c665b2f8f703d14efaf23068704e111c168f85d8383ce00db1b
4
+ data.tar.gz: 83202ec05f5d4a7139edcabfc0be8134394216710402183bda98ab0b6e3f88d0
5
5
  SHA512:
6
- metadata.gz: e606b2d087be49f0ddaa3dff9d4dd0b62ad8e70e0a3d5f044df875b53606dc46ab0755d33edca16bd10b9c386be4e87ea10ef47a34a4cecda4f635e32f2236da
7
- data.tar.gz: a19cde7e7a898b1c93f404dfdc94b9828140f4793c118a3c596e49c7ba77e317c33ac958cb9cc1d4fe33b6ea7cadd2962ed6d4373e6f865e417fa44d742a48f9
6
+ metadata.gz: 55ef0814c6bc2721a8007c5df59d85eee7fd2c0aeab8e7647ff6848f5fc7cba00a063bee4fdfd05bc9f1c20dcc2bccad1544e8a1e64bad7e76d9094204a0dfa8
7
+ data.tar.gz: e44d5fd2b8a7561dc7c81d2ad48cd4490457340065ec3d852aaf84444e68f7b323355bc39438814ecb6e3f0a1120c7caac4fa9738bcf3791286e43fdba37bfe8
@@ -16,6 +16,8 @@ concurrency:
16
16
  group: ${{ github.head_ref || github.sha }}-${{ github.workflow }}
17
17
  cancel-in-progress: true
18
18
 
19
+ permissions: read-all
20
+
19
21
  jobs:
20
22
  test:
21
23
  runs-on: ${{ matrix.os }}
@@ -25,7 +27,6 @@ jobs:
25
27
  matrix:
26
28
  os: ['ubuntu-latest', 'macos-latest', 'windows-latest']
27
29
  ruby-version: ['3.3', '3.2', '3.1', '3.0', '2.7']
28
-
29
30
  name: Ruby ${{ matrix.ruby-version }} on ${{ matrix.os }}
30
31
  steps:
31
32
  - uses: actions/checkout@v3
@@ -41,3 +42,23 @@ jobs:
41
42
  run: bundle install
42
43
  - name: Run tests
43
44
  run: bundle exec rake test TESTOPTS="-v --no-show-detail-immediately"
45
+
46
+ test-windows-service:
47
+ runs-on: windows-latest
48
+ strategy:
49
+ fail-fast: false
50
+ matrix:
51
+ ruby-version: ['3.3', '3.2', '3.1', '3.0', '2.7']
52
+ name: Windows service (Ruby ${{ matrix.ruby-version }})
53
+ steps:
54
+ - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
55
+ - name: Set up Ruby
56
+ uses: ruby/setup-ruby@e34163cd15f4bb403dcd72d98e295997e6a55798 # v1.238.0
57
+ with:
58
+ ruby-version: ${{ matrix.ruby-version }}
59
+ - name: Install dependencies
60
+ run: |
61
+ bundle install
62
+ rake install
63
+ - name: Run tests
64
+ run: test\scripts\windows_service_test.ps1
data/CHANGELOG.md CHANGED
@@ -1,7 +1,23 @@
1
1
  # v1.16
2
2
 
3
+ ## Release v1.16.9 - 2025/05/14
4
+
5
+ ### Bug Fix
6
+
7
+ * winsvc: Fix bug where service accidentally stops after starting.
8
+ The previous version (v1.16.8) should not be used for Windows Service.
9
+ https://github.com/fluent/fluentd/pull/4955
10
+
11
+ ### Misc
12
+
13
+ * CI improvemnts
14
+ https://github.com/fluent/fluentd/pull/4956
15
+
3
16
  ## Release v1.16.8 - 2025/05/01
4
17
 
18
+ **This version has a critical bug about Windows Service. Do not use this version.**
19
+ (https://github.com/fluent/fluentd/pull/4955)
20
+
5
21
  ### Bug Fix
6
22
 
7
23
  * winsvc: Stop the service when the supervisor is dead
@@ -16,6 +16,6 @@
16
16
 
17
17
  module Fluent
18
18
 
19
- VERSION = '1.16.8'
19
+ VERSION = '1.16.9'
20
20
 
21
21
  end
data/lib/fluent/winsvc.rb CHANGED
@@ -63,7 +63,7 @@ begin
63
63
  loop do
64
64
  sleep 5
65
65
  break unless running?
66
- raise Errno::ECHILD unless Process.waitpid2(@pid, Process::WNOHANG)
66
+ raise Errno::ECHILD if Process.waitpid(@pid, Process::WNOHANG)
67
67
  end
68
68
  rescue Errno::ECHILD
69
69
  @pid = 0
@@ -0,0 +1,73 @@
1
+ $ErrorActionPreference = "Stop"
2
+ Set-PSDebug -Trace 1
3
+
4
+ $default_conf_path = (Resolve-Path fluent.conf).Path
5
+ $current_path = (Get-Location).Path
6
+ $log_path = "$current_path/fluentd.log"
7
+
8
+ ruby bin/fluentd --reg-winsvc i --reg-winsvc-fluentdopt "-c '$default_conf_path' -o '$log_path'"
9
+
10
+ # Test: must not start automatically
11
+ if ((Get-Service fluentdwinsvc).Status -ne "Stopped") {
12
+ Write-Error "The service should not start automatically."
13
+ }
14
+
15
+ Start-Service fluentdwinsvc
16
+ Start-Sleep 30
17
+
18
+ # Test: the service should be running after started
19
+ if ((Get-Service fluentdwinsvc).Status -ne "Running") {
20
+ Write-Error "The service should be running after started."
21
+ }
22
+
23
+ # Test: no warn/error/fatal logs
24
+ Get-ChildItem "*.log" | %{
25
+ Get-Content $_
26
+ if (Select-String -Path $_ -Pattern "[warn]", "[error]", "[fatal]" -SimpleMatch -Quiet) {
27
+ Select-String -Path $_ -Pattern "[warn]", "[error]", "[fatal]" -SimpleMatch
28
+ Write-Error "There are abnormal level logs in ${_}:"
29
+ }
30
+ }
31
+
32
+ Stop-Service fluentdwinsvc
33
+ Start-Sleep 10 # Somehow it is possible that some processes stay alive for a while. (This could be not good behavior...)
34
+
35
+ # Test: status after stopped
36
+ if ((Get-Service fluentdwinsvc).Status -ne "Stopped") {
37
+ Write-Error "The service should be in 'Stopped' status after stopped."
38
+ }
39
+ # Test: all Ruby processes should stop
40
+ $ruby_processes = Get-Process -name ruby -ErrorAction SilentlyContinue
41
+ if ($ruby_processes.Count -ne 0) {
42
+ Write-Output $ruby_processes
43
+ Write-Error "All Ruby processes should stop."
44
+ }
45
+
46
+ # Test: service should stop when the supervisor fails to launch
47
+ # https://github.com/fluent/fluentd/pull/4909
48
+ $test_setting = @'
49
+ <source>
50
+ @type sample
51
+ @id DUPLICATED_ID
52
+ tag test
53
+ </source>
54
+ <match test>
55
+ @type stdout
56
+ @id DUPLICATED_ID
57
+ </match>
58
+ '@
59
+ Add-Content -Path "duplicated_id.conf" -Encoding UTF8 -Value $test_setting
60
+ ruby bin/fluentd --reg-winsvc-fluentdopt "-c '$current_path/duplicated_id.conf' -o '$log_path'"
61
+ Start-Service fluentdwinsvc
62
+ Start-Sleep 30
63
+ if ((Get-Service fluentdwinsvc).Status -ne "Stopped") {
64
+ Write-Error "The service should be in 'Stopped' status when the supervisor fails to launch."
65
+ }
66
+ $ruby_processes = Get-Process -name ruby -ErrorAction SilentlyContinue
67
+ if ($ruby_processes.Count -ne 0) {
68
+ Write-Output $ruby_processes
69
+ Write-Error "All Ruby processes should stop."
70
+ }
71
+
72
+ ruby bin/fluentd --reg-winsvc u
73
+ Remove-Item $log_path
metadata CHANGED
@@ -1,14 +1,13 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: fluentd
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.16.8
4
+ version: 1.16.9
5
5
  platform: x86-mingw32
6
6
  authors:
7
7
  - Sadayuki Furuhashi
8
- autorequire:
9
8
  bindir: bin
10
9
  cert_chain: []
11
- date: 2025-05-01 00:00:00.000000000 Z
10
+ date: 1980-01-02 00:00:00.000000000 Z
12
11
  dependencies:
13
12
  - !ruby/object:Gem::Dependency
14
13
  name: bundler
@@ -1001,6 +1000,7 @@ files:
1001
1000
  - test/scripts/fluent/plugin/out_test.rb
1002
1001
  - test/scripts/fluent/plugin/out_test2.rb
1003
1002
  - test/scripts/fluent/plugin/parser_known.rb
1003
+ - test/scripts/windows_service_test.ps1
1004
1004
  - test/test_capability.rb
1005
1005
  - test/test_clock.rb
1006
1006
  - test/test_config.rb
@@ -1039,7 +1039,6 @@ homepage: https://www.fluentd.org/
1039
1039
  licenses:
1040
1040
  - Apache-2.0
1041
1041
  metadata: {}
1042
- post_install_message:
1043
1042
  rdoc_options: []
1044
1043
  require_paths:
1045
1044
  - lib
@@ -1054,8 +1053,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
1054
1053
  - !ruby/object:Gem::Version
1055
1054
  version: '0'
1056
1055
  requirements: []
1057
- rubygems_version: 3.4.19
1058
- signing_key:
1056
+ rubygems_version: 3.6.8
1059
1057
  specification_version: 4
1060
1058
  summary: Fluentd event collector
1061
1059
  test_files:
@@ -1244,6 +1242,7 @@ test_files:
1244
1242
  - test/scripts/fluent/plugin/out_test.rb
1245
1243
  - test/scripts/fluent/plugin/out_test2.rb
1246
1244
  - test/scripts/fluent/plugin/parser_known.rb
1245
+ - test/scripts/windows_service_test.ps1
1247
1246
  - test/test_capability.rb
1248
1247
  - test/test_clock.rb
1249
1248
  - test/test_config.rb