Skip to content

Implement support for multiple sockets for systemd activation #24118

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Aug 18, 2020
Merged

Implement support for multiple sockets for systemd activation #24118

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
15893a2
Implement support for multiple LISTEN_FDS for systemd activation
onyxmaster Jul 20, 2020
10f3b7d
Fix handle iteration
onyxmaster Jul 20, 2020
457118e
Match %LISTEN_FDS% handling behavior to sd_listen_fds
onyxmaster Jul 31, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 14 additions & 4 deletions src/Servers/Kestrel/Core/src/Systemd/KestrelServerOptionsSystemdExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,12 @@ namespace Microsoft.AspNetCore.Hosting
public static class KestrelServerOptionsSystemdExtensions
{
// SD_LISTEN_FDS_START https://www.freedesktop.org/software/systemd/man/sd_listen_fds.html
private const ulong SdListenFdsStart = 3;
private const int SdListenFdsStart = 3;
private const string ListenPidEnvVar = "LISTEN_PID";
private const string ListenFdsEnvVar = "LISTEN_FDS";

/// <summary>
/// Open file descriptor (SD_LISTEN_FDS_START) initialized by systemd socket-based activation logic if available.
/// Open file descriptors (starting from SD_LISTEN_FDS_START) initialized by systemd socket-based activation logic if available.
/// </summary>
/// <returns>
/// The <see cref="KestrelServerOptions"/>.
Expand All @@ -26,7 +27,7 @@ public static KestrelServerOptions UseSystemd(this KestrelServerOptions options)
}

/// <summary>
/// Open file descriptor (SD_LISTEN_FDS_START) initialized by systemd socket-based activation logic if available.
/// Open file descriptors (starting from SD_LISTEN_FDS_START) initialized by systemd socket-based activation logic if available.
/// Specify callback to configure endpoint-specific settings.
/// </summary>
/// <returns>
Expand All @@ -36,7 +37,16 @@ public static KestrelServerOptions UseSystemd(this KestrelServerOptions options,
{
if (string.Equals(Process.GetCurrentProcess().Id.ToString(CultureInfo.InvariantCulture), Environment.GetEnvironmentVariable(ListenPidEnvVar), StringComparison.Ordinal))
{
options.ListenHandle(SdListenFdsStart, configure);
// This matches sd_listen_fds behavior that requires %LISTEN_FDS% to be present and in range [1;INT_MAX-SD_LISTEN_FDS_START]
if (int.TryParse(Environment.GetEnvironmentVariable(ListenFdsEnvVar), NumberStyles.None, NumberFormatInfo.InvariantInfo, out var listenFds)
&& listenFds > 0
&& listenFds <= int.MaxValue - SdListenFdsStart)
{
for (var handle = SdListenFdsStart; handle < SdListenFdsStart + listenFds; ++handle)
{
options.ListenHandle((ulong)handle, configure);
}
}
}

return options;
Expand Down