mirror of
https://github.com/tgstation/tgstation-server.git
synced 2026-08-24 05:27:30 +01:00
Merge branch 'master' into dev
This commit is contained in:
@@ -169,7 +169,17 @@ namespace Tgstation.Server.Host.System
|
||||
DefaultIOManager.BlockingTaskCreationOptions,
|
||||
TaskScheduler.Current);
|
||||
|
||||
MeasureProcessorTimeDelta();
|
||||
try
|
||||
{
|
||||
lastProcessorUsageTime = handle.TotalProcessorTime;
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
logger.LogTrace(ex, "Failed to measure initial process time.");
|
||||
lastProcessorUsageTime = TimeSpan.Zero;
|
||||
}
|
||||
|
||||
lastProcessorMeasureTime = DateTimeOffset.UtcNow;
|
||||
|
||||
logger.LogTrace("Created process ID: {pid}", Id);
|
||||
}
|
||||
|
||||
@@ -163,8 +163,6 @@
|
||||
<PackageReference Include="System.DirectoryServices.AccountManagement" Version="9.0.3" />
|
||||
<!-- Usage: Identifying owning user of Windows Process objects -->
|
||||
<PackageReference Include="System.Management" Version="9.0.3" />
|
||||
<!-- Usage: Temporary resolution to compatibility issues with EFCore 7 and .NET 8 -->
|
||||
<PackageReference Include="System.Security.Permissions" Version="9.0.3" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
|
||||
<PropertyGroup>
|
||||
<OutputType>Exe</OutputType>
|
||||
<TargetFramework>net8.0</TargetFramework>
|
||||
<TargetFramework>$(TgsFrameworkVersion)</TargetFramework>
|
||||
<Nullable>enable</Nullable>
|
||||
</PropertyGroup>
|
||||
|
||||
|
||||
Reference in New Issue
Block a user