yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

V9: Fix issue with recurring services that executes too often (#10473)

Browse Source 
* Fix exception in ReportSiteTask.cs, when running multiple times..
Also fixes issue with how often the tasks are executed

* Fix timeout
This commit is contained in:
Bjarke Berg
2021-06-15 11:02:55 +02:00
committed by GitHub
parent 418ba569f1
commit e0a9397d92
2 changed files with 18 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/Umbraco.Infrastructure/HostedServices/RecurringHostedServiceBase.cs
View File

@@ -62,8 +62,9 @@ namespace Umbraco.Cms.Infrastructure.HostedServices
}
finally
{
// Resume now that the task is complete
_timer?.Change((int)_delay.TotalMilliseconds, (int)_period.TotalMilliseconds);
// Resume now that the task is complete - Note we use period in both because we don't want to execute again after the delay.
// So first execution is after _delay, and the we wait _period between each
_timer?.Change((int)_period.TotalMilliseconds, (int)_period.TotalMilliseconds);
}
}

22
src/Umbraco.Infrastructure/HostedServices/ReportSiteTask.cs
View File

@@ -52,13 +52,24 @@ namespace Umbraco.Cms.Infrastructure.HostedServices
try
{
// Send data to LIVE telemetry
s_httpClient.BaseAddress = new Uri("https://telemetry.umbraco.com/");
if (s_httpClient.BaseAddress is null)
{
// Send data to LIVE telemetry
s_httpClient.BaseAddress = new Uri("https://telemetry.umbraco.com/");
// Set a low timeout - no need to use a larger default timeout for this POST request
s_httpClient.Timeout = new TimeSpan(0, 0, 1);
#if DEBUG
// Send data to DEBUG telemetry service
s_httpClient.BaseAddress = new Uri("https://telemetry.rainbowsrock.net/");
// Send data to DEBUG telemetry service
s_httpClient.BaseAddress = new Uri("https://telemetry.rainbowsrock.net/");
#endif
}
s_httpClient.DefaultRequestHeaders.TryAddWithoutValidation("Content-Type", "application/json");
@@ -67,9 +78,6 @@ namespace Umbraco.Cms.Infrastructure.HostedServices
var postData = new TelemetryReportData { Id = telemetrySiteIdentifier, Version = _umbracoVersion.SemanticVersion.ToSemanticStringWithoutBuild() };
request.Content = new StringContent(JsonConvert.SerializeObject(postData), Encoding.UTF8, "application/json"); //CONTENT-TYPE header
// Set a low timeout - no need to use a larger default timeout for this POST request
s_httpClient.Timeout = new TimeSpan(0, 0, 1);
// Make a HTTP Post to telemetry service
// https://telemetry.umbraco.com/installs/
// Fire & Forget, do not need to know if its a 200, 500 etc