notify: Send all sd_notify signals from main caddy process #4060
Conversation
This file contains hidden or 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
carlwgeorge
force-pushed
the
notify-reload-from-run
branch
4 times, most recently
from
f9d889f to
ceda5c5
Compare
Member
|
I think this looks good now! |
carlwgeorge
force-pushed
the
notify-reload-from-run
branch
from
ceda5c5 to
f559bb1
Compare
Member
|
https://github.com/carlwgeorge/caddy/blob/f559bb10f64e09e4462591f841a14a2aed0f994d/notify/notify_linux.go#L45 has a typo that #4081 aims to fix, would you mind making the change in here (to avoid the conflict)? |
Initial sd_notify support was added in caddyserver#3963, but that sent signals from both cmdRun and cmdReload. This approach has two drawbacks: - Reloads initiated via the API do not send signals. - The signals are sent from different processes, which requires the `NotifyAccess=exec` directive in the unit file. This change moves the NotifyReloading and NotifyReadiness invocations to Load, which address both of those drawbacks. It also adds a complimentary NotifyStopping method which is invoked from handleStop. All the notify methods are defined in a notify package to avoid an import loop.
carlwgeorge
force-pushed
the
notify-reload-from-run
branch
from
f559bb1 to
d183366
Compare
Contributor
Author
|
Sure thing, added that typo fix and went ahead and rebased on master. |
francislavoie
changed the title
francislavoie
approved these changes
Mar 28, 2021
Member
francislavoie
left a comment
francislavoie
left a comment
There was a problem hiding this comment.
This looks good to me.
@rumpelsepp Do you have any thoughts about this?
Contributor
|
These adjustments make sense, I would say. 👍 |
mholt
approved these changes
Apr 5, 2021
Member
mholt
left a comment
mholt
left a comment
There was a problem hiding this comment.
Great, thank you very much for the enhancement.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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.
Initial sd_notify support was added in #3963, but that sent signals from both cmdRun and cmdReload. This approach has two drawbacks:
NotifyAccess=execdirective in the unit file.This change moves the NotifyReloading and NotifyReadiness invocations to Load, which address both of those drawbacks. It also adds a complimentary NotifyStopping method which is invoked from handleStop. All the notify methods are defined in a notify package to avoid an import loop.