Skip to content
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

Jump to bottom

[Group 9] Enable nullable annotations for Microsoft.Extensions.Hosting.Systemd #67513

Merged
merged 3 commits into from
Apr 18, 2022
Merged

[Group 9] Enable nullable annotations for Microsoft.Extensions.Hosting.Systemd #67513

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
dceaa8e
Annotate
maxkoshevoi Apr 3, 2022
c94564c
Merge branch 'main' into mk/43605-hosting-systemd
maxkoshevoi Apr 16, 2022
1baf2de
Fix API compat check by removing MemberNotNullWhen attribute.
eerhardt Apr 18, 2022
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
1 change: 1 addition & 0 deletions ...ries/Microsoft.Extensions.Hosting.Systemd/ref/Microsoft.Extensions.Hosting.Systemd.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

<PropertyGroup>
<TargetFrameworks>$(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.1</TargetFrameworks>
<Nullable>enable</Nullable>
<EnableDefaultItems>true</EnableDefaultItems>
</PropertyGroup>

Expand Down
1 change: 1 addition & 0 deletions ...ries/Microsoft.Extensions.Hosting.Systemd/src/Microsoft.Extensions.Hosting.Systemd.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

<PropertyGroup>
<TargetFrameworks>$(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.1</TargetFrameworks>
<Nullable>enable</Nullable>
<EnableDefaultItems>true</EnableDefaultItems>
<PackageDescription>.NET hosting infrastructure for Systemd Services.</PackageDescription>
<!-- Use targeting pack references instead of granular ones in the project file. -->
Expand Down
4 changes: 2 additions & 2 deletions src/libraries/Microsoft.Extensions.Hosting.Systemd/src/ServiceState.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@ public struct ServiceState
/// <summary>
/// Create custom ServiceState.
/// </summary>
public ServiceState(string state)
public ServiceState(string state!!)
{
_data = Encoding.UTF8.GetBytes(state ?? throw new ArgumentNullException(nameof(state)));
_data = Encoding.UTF8.GetBytes(state);
}

/// <summary>
Expand Down
4 changes: 2 additions & 2 deletions src/libraries/Microsoft.Extensions.Hosting.Systemd/src/SystemdLifetime.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,12 +41,12 @@ public Task WaitForStartAsync(CancellationToken cancellationToken)
{
_applicationStartedRegistration = ApplicationLifetime.ApplicationStarted.Register(state =>
{
((SystemdLifetime)state).OnApplicationStarted();
((SystemdLifetime)state!).OnApplicationStarted();
},
this);
_applicationStoppingRegistration = ApplicationLifetime.ApplicationStopping.Register(state =>
{
((SystemdLifetime)state).OnApplicationStopping();
((SystemdLifetime)state!).OnApplicationStopping();
},
this);

Expand Down
2 changes: 1 addition & 1 deletion src/libraries/Microsoft.Extensions.Hosting.Systemd/src/SystemdLifetime.netcoreapp.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ namespace Microsoft.Extensions.Hosting.Systemd
{
public partial class SystemdLifetime
{
private PosixSignalRegistration _sigTermRegistration;
private PosixSignalRegistration? _sigTermRegistration;

private partial void RegisterShutdownHandlers()
{
Expand Down
10 changes: 5 additions & 5 deletions src/libraries/Microsoft.Extensions.Hosting.Systemd/src/SystemdNotifier.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,14 @@ public class SystemdNotifier : ISystemdNotifier
{
private const string NOTIFY_SOCKET = "NOTIFY_SOCKET";

private readonly string _socketPath;
private readonly string? _socketPath;

public SystemdNotifier() :
this(GetNotifySocketPath())
{ }

// For testing
internal SystemdNotifier(string socketPath)
internal SystemdNotifier(string? socketPath)
{
_socketPath = socketPath;
}
Expand All @@ -37,7 +37,7 @@ public void Notify(ServiceState state)

using (var socket = new Socket(AddressFamily.Unix, SocketType.Dgram, ProtocolType.Unspecified))
{
var endPoint = new UnixDomainSocketEndPoint(_socketPath);
var endPoint = new UnixDomainSocketEndPoint(_socketPath!);
socket.Connect(endPoint);

// It's safe to do a non-blocking call here: messages sent here are much
Expand All @@ -46,9 +46,9 @@ public void Notify(ServiceState state)
}
}

private static string GetNotifySocketPath()
private static string? GetNotifySocketPath()
{
string socketPath = Environment.GetEnvironmentVariable(NOTIFY_SOCKET);
string? socketPath = Environment.GetEnvironmentVariable(NOTIFY_SOCKET);

if (string.IsNullOrEmpty(socketPath))
{
Expand Down