Skip to content

Commit c3188e9

Browse files
jgauffinjgauffin
committed
Corrected issues
1 parent 0d58c1b commit c3188e9

File tree

20 files changed

+212
-85
lines changed

20 files changed

+212
-85
lines changed

‎src/Server/Coderr.Server.Api.Client/codeRR.Server.Api.Client.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<AssemblyName>Coderr.Server.Api.Client</AssemblyName>
2323
</PropertyGroup>
2424
<ItemGroup>
25-
<PackageReference Include="DotNetCqs" Version="2.0.3.9" />
25+
<PackageReference Include="DotNetCqs" Version="2.0.4" />
2626
<PackageReference Include="System.ComponentModel.Annotations" Version="4.4.0" />
2727
</ItemGroup>
2828
<ItemGroup>

‎src/Server/Coderr.Server.Api/codeRR.Server.Api.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
<NoWarn>1701;1702;1705;1591</NoWarn>
2626
</PropertyGroup>
2727
<ItemGroup>
28-
<PackageReference Include="DotNetCqs" Version="2.0.3.9" />
28+
<PackageReference Include="DotNetCqs" Version="2.0.4" />
2929
</ItemGroup>
3030
<ItemGroup Condition="'$(TargetFramework)' == 'net452'">
3131
<Reference Include="System.Net.Http" />

‎src/Server/Coderr.Server.App/Core/Incidents/Jobs/DeleteEmptyIncidents.cs‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,16 @@ public async Task ExecuteAsync()
3939
using (var cmd = _unitOfWork.CreateDbCommand())
4040
{
4141
cmd.CommandText =
42-
$@"DELETE TOP(1000) Incidents WHERE Id IN (select Incidents.Id
43-
FROM Incidents
44-
LEFT JOIN ErrorReports ON (ErrorReports.IncidentId = Incidents.Id)
45-
WHERE ErrorReports.Id IS NULL) AND State <> {(int)IncidentState.Ignored}";
42+
$@"DELETE TOP(1000) Incidents
43+
WHERE Id IN
44+
(
45+
SELECT Incidents.Id
46+
FROM Incidents WITH(NOLOCK)
47+
LEFT JOIN ErrorReports WITH(NOLOCK) ON (ErrorReports.IncidentId = Incidents.Id)
48+
WHERE ErrorReports.Id IS NULL
49+
)
50+
AND State <> {(int)IncidentState.Ignored} OR LastReportAtUtc < @yesterday";
51+
cmd.AddParameter("yesterday", DateTime.Today.AddDays(-1));
4652
var rows = await cmd.ExecuteNonQueryAsync();
4753
if (rows > 0)
4854
{

‎src/Server/Coderr.Server.App/Core/Reports/Jobs/DeleteReportsBelowReportLimit.cs‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ public int MaxReportsPerIncident
4444
{
4545
var config = _configStore.Load<ReportConfig>();
4646
if (config == null)
47-
return 1;
47+
return 100;
4848
return config.MaxReportsPerIncident;
4949
}
5050
}
@@ -74,7 +74,8 @@ HAVING Count(IncidentId) > @max
7474

7575
foreach (var incidentIdAndCount in incidentsToTruncate)
7676
{
77-
var rowsToDelete = Math.Min(1000, incidentIdAndCount.Item2 - MaxReportsPerIncident);
77+
//do not delete more then 500 at a time.
78+
var rowsToDelete = Math.Min(500, incidentIdAndCount.Item2 - MaxReportsPerIncident);
7879
using (var cmd = _unitOfWork.CreateCommand())
7980
{
8081
var sql = $@"With RowsToDelete AS

‎src/Server/Coderr.Server.App/Modules/Geolocation/EventHandlers/StorePositionFromNewReport.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ public async Task HandleAsync(IMessageContext context, ReportAddedToIncident e)
7878
}
7979
catch (Exception exception)
8080
{
81-
_logger.Error("Failed to store location: " + json, exception);
81+
_logger.Error($"Failed to store location for incident {e.Incident.Id}/report {e.Report.Id}: {json}", exception);
8282
}
8383
}
8484
}

‎src/Server/Coderr.Server.App/codeRR.Server.App.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
</PropertyGroup>
88
<ItemGroup>
99
<PackageReference Include="ColorCode" Version="1.0.1" />
10-
<PackageReference Include="DotNetCqs" Version="2.0.3.9" />
10+
<PackageReference Include="DotNetCqs" Version="2.0.4" />
1111
<PackageReference Include="Griffin.Container" Version="1.1.8" />
1212
<PackageReference Include="Griffin.Framework" Version="2.0.0-alpha01" />
1313
<PackageReference Include="log4net" Version="2.0.8" />

‎src/Server/Coderr.Server.Infrastructure/codeRR.Server.Infrastructure.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<AssemblyName>Coderr.Server.Infrastructure</AssemblyName>
66
</PropertyGroup>
77
<ItemGroup>
8-
<PackageReference Include="DotNetCqs" Version="2.0.3.9" />
8+
<PackageReference Include="DotNetCqs" Version="2.0.4" />
99
<PackageReference Include="Griffin.Container" Version="1.1.8" />
1010
<PackageReference Include="Griffin.Framework" Version="2.0.0-alpha01" />
1111
<PackageReference Include="log4net" Version="2.0.8" />

‎src/Server/Coderr.Server.ReportAnalyzer/codeRR.Server.ReportAnalyzer.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<DefaultItemExcludes>$(DefaultItemExcludes);**\*.DotSettings;</DefaultItemExcludes>
77
</PropertyGroup>
88
<ItemGroup>
9-
<PackageReference Include="DotNetCqs" Version="2.0.3.9" />
9+
<PackageReference Include="DotNetCqs" Version="2.0.4" />
1010
<PackageReference Include="Griffin.Container" Version="1.1.8" />
1111
<PackageReference Include="Griffin.Framework" Version="2.0.0-alpha01" />
1212
<PackageReference Include="log4net" Version="2.0.8" />

‎src/Server/Coderr.Server.SqlServer.Tests/codeRR.Server.SqlServer.Tests.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<PackageReference Include="xunit" Version="2.3.1" />
1010
<PackageReference Include="FluentAssertions" Version="4.19.4" />
1111
<PackageReference Include="NSubstitute" Version="3.1.0" />
12-
<PackageReference Include="DotNetCqs" Version="2.0.3.9" />
12+
<PackageReference Include="DotNetCqs" Version="2.0.4" />
1313
</ItemGroup>
1414
<ItemGroup>
1515
<ProjectReference Include="..\Coderr.Server.SqlServer\codeRR.Server.SqlServer.csproj" />

‎src/Server/Coderr.Server.SqlServer/Core/Feedback/LookupReportsForFeedback.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ private async Task LookupReportInfo(IEnumerable<FeedbackEntity> items)
8686
{
8787
using (var cmd = (DbCommand) _unitOfWork.CreateCommand())
8888
{
89-
cmd.CommandText = "SELECT Id, ApplicationId, IncidentId FROM ErrorReports WHERE ";
89+
cmd.CommandText = "SELECT Id, ApplicationId, IncidentId FROM ErrorReports WITH(NOLOCK) WHERE ";
9090
if (item.ErrorId != null)
9191
{
9292
cmd.CommandText += "ErrorId = @id";

0 commit comments

Comments
 (0)