Skip to content

Commit 857233f

Browse files
authored
Merge branch 'main' into upgrade-mysql2-gem
2 parents d12e7a2 + 66fdfda commit 857233f

File tree

2 files changed

+63
-59
lines changed

2 files changed

+63
-59
lines changed

Gemfile.lock

Lines changed: 60 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -12,32 +12,32 @@ PATH
1212
GEM
1313
remote: https://rubygems.org/
1414
specs:
15-
actionpack (7.1.3.4)
16-
actionview (= 7.1.3.4)
17-
activesupport (= 7.1.3.4)
15+
actionpack (7.1.4.1)
16+
actionview (= 7.1.4.1)
17+
activesupport (= 7.1.4.1)
1818
nokogiri (>= 1.8.5)
1919
racc
2020
rack (>= 2.2.4)
2121
rack-session (>= 1.0.1)
2222
rack-test (>= 0.6.3)
2323
rails-dom-testing (~> 2.2)
2424
rails-html-sanitizer (~> 1.6)
25-
actionview (7.1.3.4)
26-
activesupport (= 7.1.3.4)
25+
actionview (7.1.4.1)
26+
activesupport (= 7.1.4.1)
2727
builder (~> 3.1)
2828
erubi (~> 1.11)
2929
rails-dom-testing (~> 2.2)
3030
rails-html-sanitizer (~> 1.6)
31-
activejob (7.1.3.4)
32-
activesupport (= 7.1.3.4)
31+
activejob (7.1.4.1)
32+
activesupport (= 7.1.4.1)
3333
globalid (>= 0.3.6)
34-
activemodel (7.1.3.4)
35-
activesupport (= 7.1.3.4)
36-
activerecord (7.1.3.4)
37-
activemodel (= 7.1.3.4)
38-
activesupport (= 7.1.3.4)
34+
activemodel (7.1.4.1)
35+
activesupport (= 7.1.4.1)
36+
activerecord (7.1.4.1)
37+
activemodel (= 7.1.4.1)
38+
activesupport (= 7.1.4.1)
3939
timeout (>= 0.4.0)
40-
activesupport (7.1.3.4)
40+
activesupport (7.1.4.1)
4141
base64
4242
bigdecimal
4343
concurrent-ruby (~> 1.0, >= 1.0.2)
@@ -66,91 +66,92 @@ GEM
6666
raabro (~> 1.4)
6767
globalid (1.2.1)
6868
activesupport (>= 6.1)
69-
i18n (1.14.5)
69+
i18n (1.14.6)
7070
concurrent-ruby (~> 1.0)
71-
io-console (0.6.0)
72-
irb (1.6.2)
73-
reline (>= 0.3.0)
74-
json (2.7.1)
71+
io-console (0.7.2)
72+
irb (1.14.1)
73+
rdoc (>= 4.0.0)
74+
reline (>= 0.4.2)
75+
json (2.8.2)
7576
language_server-protocol (3.17.0.3)
76-
loofah (2.22.0)
77+
loofah (2.23.1)
7778
crass (~> 1.0.2)
7879
nokogiri (>= 1.12.0)
79-
mini_portile2 (2.8.1)
80-
minitest (5.24.0)
80+
mini_portile2 (2.8.8)
81+
minitest (5.25.2)
8182
mocha (2.1.0)
8283
ruby2_keywords (>= 0.0.5)
83-
mutex_m (0.2.0)
84+
mutex_m (0.3.0)
8485
mysql2 (0.5.6)
85-
nio4r (2.7.0)
86-
nokogiri (1.16.6-arm64-darwin)
86+
nio4r (2.7.4)
87+
nokogiri (1.16.7-arm64-darwin)
8788
racc (~> 1.4)
88-
nokogiri (1.16.6-x86_64-darwin)
89+
nokogiri (1.16.7-x86_64-darwin)
8990
racc (~> 1.4)
90-
nokogiri (1.16.6-x86_64-linux)
91+
nokogiri (1.16.7-x86_64-linux)
9192
racc (~> 1.4)
92-
parallel (1.24.0)
93-
parser (3.3.0.5)
93+
parallel (1.26.3)
94+
parser (3.3.6.0)
9495
ast (~> 2.4.1)
9596
racc
9697
pg (1.5.4)
97-
puma (6.4.2)
98+
psych (5.2.0)
99+
stringio
100+
puma (6.4.3)
98101
nio4r (~> 2.0)
99102
raabro (1.4.0)
100-
racc (1.8.0)
101-
rack (3.1.5)
103+
racc (1.8.1)
104+
rack (3.1.8)
102105
rack-session (2.0.0)
103106
rack (>= 3.0.0)
104107
rack-test (2.1.0)
105108
rack (>= 1.3)
106-
rackup (2.1.0)
109+
rackup (2.2.1)
107110
rack (>= 3)
108-
webrick (~> 1.8)
109111
rails-dom-testing (2.2.0)
110112
activesupport (>= 5.0.0)
111113
minitest
112114
nokogiri (>= 1.6)
113115
rails-html-sanitizer (1.6.0)
114116
loofah (~> 2.21)
115117
nokogiri (~> 1.14)
116-
railties (7.1.3.4)
117-
actionpack (= 7.1.3.4)
118-
activesupport (= 7.1.3.4)
118+
railties (7.1.4.1)
119+
actionpack (= 7.1.4.1)
120+
activesupport (= 7.1.4.1)
119121
irb
120122
rackup (>= 1.0.0)
121123
rake (>= 12.2)
122124
thor (~> 1.0, >= 1.2.2)
123125
zeitwerk (~> 2.6)
124126
rainbow (3.1.1)
125-
rake (13.0.6)
126-
regexp_parser (2.9.0)
127-
reline (0.3.2)
127+
rake (13.2.1)
128+
rdoc (6.8.1)
129+
psych (>= 4.0.0)
130+
regexp_parser (2.9.2)
131+
reline (0.5.12)
128132
io-console (~> 0.5)
129-
rexml (3.3.6)
130-
strscan
131-
rubocop (1.62.1)
133+
rubocop (1.69.0)
132134
json (~> 2.3)
133135
language_server-protocol (>= 3.17.0)
134136
parallel (~> 1.10)
135137
parser (>= 3.3.0.2)
136138
rainbow (>= 2.2.2, < 4.0)
137-
regexp_parser (>= 1.8, < 3.0)
138-
rexml (>= 3.2.5, < 4.0)
139-
rubocop-ast (>= 1.31.1, < 2.0)
139+
regexp_parser (>= 2.4, < 3.0)
140+
rubocop-ast (>= 1.36.1, < 2.0)
140141
ruby-progressbar (~> 1.7)
141-
unicode-display_width (>= 2.4.0, < 3.0)
142-
rubocop-ast (1.31.2)
143-
parser (>= 3.3.0.4)
144-
rubocop-minitest (0.35.0)
142+
unicode-display_width (>= 2.4.0, < 4.0)
143+
rubocop-ast (1.36.2)
144+
parser (>= 3.3.1.0)
145+
rubocop-minitest (0.36.0)
145146
rubocop (>= 1.61, < 2.0)
146147
rubocop-ast (>= 1.31.1, < 2.0)
147-
rubocop-performance (1.21.0)
148+
rubocop-performance (1.23.0)
148149
rubocop (>= 1.48.1, < 2.0)
149150
rubocop-ast (>= 1.31.1, < 2.0)
150-
rubocop-rails (2.24.1)
151+
rubocop-rails (2.27.0)
151152
activesupport (>= 4.2.0)
152153
rack (>= 1.1)
153-
rubocop (>= 1.33.0, < 2.0)
154+
rubocop (>= 1.52.0, < 2.0)
154155
rubocop-ast (>= 1.31.1, < 2.0)
155156
rubocop-rails-omakase (1.0.0)
156157
rubocop
@@ -161,14 +162,15 @@ GEM
161162
ruby2_keywords (0.0.5)
162163
sqlite3 (1.5.4)
163164
mini_portile2 (~> 2.8.0)
164-
strscan (3.1.0)
165-
thor (1.3.1)
166-
timeout (0.4.1)
165+
stringio (3.1.2)
166+
thor (1.3.2)
167+
timeout (0.4.2)
167168
tzinfo (2.0.6)
168169
concurrent-ruby (~> 1.0)
169-
unicode-display_width (2.5.0)
170-
webrick (1.8.1)
171-
zeitwerk (2.6.12)
170+
unicode-display_width (3.1.2)
171+
unicode-emoji (~> 4.0, >= 4.0.4)
172+
unicode-emoji (4.0.4)
173+
zeitwerk (2.7.1)
172174

173175
PLATFORMS
174176
arm64-darwin-22

README.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,9 @@ The supervisor is in charge of managing these processes, and it responds to the
239239

240240
When receiving a `QUIT` signal, if workers still have jobs in-flight, these will be returned to the queue when the processes are deregistered.
241241

242-
If processes have no chance of cleaning up before exiting (e.g. if someone pulls a cable somewhere), in-flight jobs might remain claimed by the processes executing them. Processes send heartbeats, and the supervisor checks and prunes processes with expired heartbeats, which will release any claimed jobs back to their queues. You can configure both the frequency of heartbeats and the threshold to consider a process dead. See the section below for this.
242+
If processes have no chance of cleaning up before exiting (e.g. if someone pulls a cable somewhere), in-flight jobs might remain claimed by the processes executing them. Processes send heartbeats, and the supervisor checks and prunes processes with expired heartbeats. Jobs that were claimed by processes with an expired heartbeat will be marked as failed with a `SolidQueue::Processes::ProcessPrunedError`. You can configure both the frequency of heartbeats and the threshold to consider a process dead. See the section below for this.
243+
244+
In a similar way, if a worker is terminated in any other way not initiated by the above signals (e.g. a worker is sent a `KILL` signal), jobs in progress will be marked as failed so that they can be inspected, with a `SolidQueue::Processes::Process::ProcessExitError`. Sometimes a job in particular is responsible for this, for example, if it has a memory leak and you have a mechanism to kill processes over a certain memory threshold, so this will help identifying this kind of situation.
243245

244246

245247
### Database configuration

0 commit comments

Comments
 (0)