Periodically send status to systemd #3006
Merged
+118
−67
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
QWYNG
force-pushed
the
add_test_for_exohl_set_status
branch
2 times, most recently
from
e98e6d7
to
3008009
Compare
nateberkopec
added
waiting-for-review
dentarg
changed the title
7 tasks
dentarg
changed the title
ekohl
approved these changes
Jan 16, 2023
lib/puma/plugin/systemd.rb
Outdated
Comment on lines
55
to
56
| messages = Array.new(workers) do |i| | ||
| common_message(stats[:worker_status][i][:last_status]) |
There was a problem hiding this comment.
I didn't look at the actual source, but would it be possible to iterate over stats[:worker_status] instead? Untested, but something like:
Suggested change
| messages = Array.new(workers) do |i| | |
| common_message(stats[:worker_status][i][:last_status]) | |
| messages = stats[:worker_status].values do |worker| | |
| common_message(worker[:last_status]) |
There was a problem hiding this comment.
Thank you!
stats[:worker_status] is Array instanse.
So I modified it as follows
messages = stats[:worker_status].map do |worker|
common_message(worker[:last_status])
end.join(',')
With systemd it's possible to send a status line. This will show up when users run systemctl status puma.service. Most of this code is based on puma-plugin-systemd.
QWYNG
force-pushed
the
add_test_for_exohl_set_status
branch
from
3008009
to
91fa294
Compare
ekohl
reviewed
Jan 17, 2023
lib/puma/plugin/systemd.rb
Outdated
| @@ -10,7 +10,7 @@ | |||
| Puma::Plugin.create do | |||
| def start(launcher) | |||
| begin | |||
| require 'sd_notify' | |||
| require_relative '../sd_notify' | |||
| rescue LoadError | |||
| launcher.log_writer.log "Systemd integration failed. It looks like you're trying to use systemd notify but don't have sd_notify gem installed" | |||
There was a problem hiding this comment.
Now that it's vendored (6d8b728), I don't think there's a chance that it will fail to load. Certainly the message is wrong now since the sd_notify gem is no longer needed.
ekohl
reviewed
Jan 17, 2023
lib/puma/systemd.rb
Outdated
| @@ -29,6 +29,29 @@ def start_watchdog | |||
| end | |||
There was a problem hiding this comment.
Something went wrong in your rebase. This file is supposed to be deleted in the Rewrite systemd integration as a plugin commit.
The primary motiviation for this is that plugins have native integration for background threads. This is much cleaner since it allows tracking of those. For example, it's possible to clean up those threads in the test suite.
QWYNG
force-pushed
the
add_test_for_exohl_set_status
branch
from
c644273
to
338ef29
Compare
|
@dentarg |
|
Hi @dentarg, @nateberkopec |
dentarg
approved these changes
Feb 9, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Hi, Thank you for great gem.
Add test for #2833. Thank you @ekohl
it was not able to retrieve information from
Puma.stats_hashproperly.So I have changed the logic in
lib/puma/plugin/systemd.rba little.Description from #2833
Your checklist for this pull request
[ci skip]to the title of the PR.#issue" to the PR description or my commit messages.