nixos/switch-to-configuration: restart changed socket units #50340
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
Previously, socket units wouldn't be restarted if they were changed. To restart the socket, the service the socket is attached to needs to be stopped first before the socket can be restarted.
fpletz
force-pushed
the
fix/socket-change-activation
branch
from
795266e
to
c831e81
Compare
|
@GrahamcOfBorg test fcgiwrap systemd |
|
No attempt on x86_64-linux (full log) The following builds were skipped because they don't evaluate on x86_64-linux: tests.fcgiwrap, tests.systemd Partial log (click to expand)
|
|
No attempt on aarch64-linux (full log) The following builds were skipped because they don't evaluate on aarch64-linux: tests.fcgiwrap, tests.systemd Partial log (click to expand)
|
|
Tests work fine for me. Seems to be an ofborg glitch. cc @grahamc |
|
Success on x86_64-linux (full log) Attempted: fcgiwrap Partial log (click to expand)
|
|
No attempt on x86_64-darwin (full log) The following builds were skipped because they don't evaluate on x86_64-darwin: fcgiwrap Partial log (click to expand)
|
|
Success on aarch64-linux (full log) Attempted: fcgiwrap Partial log (click to expand)
|
|
For the ofborg problem: https://logs.nix.samueldr.com/nixos-borg/2018-11-13#1542105665-1542108034; (caused by #50233) |
globin
approved these changes
Nov 14, 2018
lheckemann
reviewed
Nov 15, 2018
| addresses as defined in | ||
| <citerefentry><refentrytitle>systemd.socket</refentrytitle><manvolnum>5</manvolnum></citerefentry>. | ||
| </para> | ||
| </listitem> |
There was a problem hiding this comment.
Should there also be a note about socket restarts in here?
There was a problem hiding this comment.
Hmm, yeah. you're right. Adding socking restart support is kind of a bugfix though. I'll add a paragraph.
| socketMode = mkOption { | ||
| type = types.str; | ||
| default = "0660"; | ||
| description = "File mode of the socket if it is defined as a Unix socket."; |
There was a problem hiding this comment.
I suggest we don't bikeshed this PR on this discussion, but…
Would it maybe make sense to make a socket type which contains all these options, since it may well be used in multiple places? It doesn't seem that nice to have these settings which are essentially aliases for systemd.sockets.fcgiwrap.socketConfig.*.
aneeshusa
reviewed
Nov 18, 2018
|
Are there any updates on this pull request, please? |
3 tasks
|
Done in #73871, fcgiwrap needs a new PR :) |
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.
Motivation for this change
Previously, socket units wouldn't be restarted if they were changed. To restart the socket, the service the socket is attached to needs to be stopped first before the socket can be restarted.
Discovered while converting fcgiwrap to full socket activation support and writing a test for it. These changes are also part of this PR as is the test that checks using fcgiwrap if sockets are properly restarted.
Things done
sandboxinnix.confon non-NixOS)nix-shell -p nox --run "nox-review wip"./result/bin/)nix path-info -Sbefore and after)