Browse Source

Fix stackdriver logging.

pull/909/head
Sebastian 3 years ago
parent
commit
471b8c8b36
  1. 12
      backend/extensions/Squidex.Extensions/APM/Stackdriver/StackdriverPlugin.cs
  2. 2
      backend/src/Squidex.Domain.Apps.Entities/Backup/BackupProcessor.cs
  3. 2
      backend/src/Squidex.Infrastructure/Squidex.Infrastructure.csproj

12
backend/extensions/Squidex.Extensions/APM/Stackdriver/StackdriverPlugin.cs

@ -37,12 +37,18 @@ namespace Squidex.Extensions.APM.Stackdriver
{ {
var isEnabled = config.GetValue<bool>("logging:stackdriver:enabled"); var isEnabled = config.GetValue<bool>("logging:stackdriver:enabled");
if (isEnabled) if (!isEnabled)
{ {
return;
}
var projectId = config.GetValue<string>("logging:stackdriver:projectId"); var projectId = config.GetValue<string>("logging:stackdriver:projectId");
if (!string.IsNullOrWhiteSpace(projectId)) if (string.IsNullOrWhiteSpace(projectId))
{ {
return;
}
services.AddSingleton<ITelemetryConfigurator>( services.AddSingleton<ITelemetryConfigurator>(
new Configurator(projectId)); new Configurator(projectId));
@ -58,6 +64,4 @@ namespace Squidex.Extensions.APM.Stackdriver
services.AddSingleton(c => ContextExceptionLogger.Create(projectId, serviceVersion, serviceVersion, null)); services.AddSingleton(c => ContextExceptionLogger.Create(projectId, serviceVersion, serviceVersion, null));
} }
} }
}
}
} }

2
backend/src/Squidex.Domain.Apps.Entities/Backup/BackupProcessor.cs

@ -128,7 +128,6 @@ namespace Squidex.Domain.Apps.Entities.Backup
private async Task ProcessAsync(Run run, private async Task ProcessAsync(Run run,
CancellationToken ct) CancellationToken ct)
{ {
var lastTimestamp = run.Job.Started;
try try
{ {
await using (var stream = backupArchiveLocation.OpenStream(run.Job.Id)) await using (var stream = backupArchiveLocation.OpenStream(run.Job.Id))
@ -182,6 +181,7 @@ namespace Squidex.Domain.Apps.Entities.Backup
await backupArchiveStore.UploadAsync(run.Job.Id, stream, ct); await backupArchiveStore.UploadAsync(run.Job.Id, stream, ct);
} }
await SetStatusAsync(run, JobStatus.Completed); await SetStatusAsync(run, JobStatus.Completed);
} }
catch (OperationCanceledException) catch (OperationCanceledException)

2
backend/src/Squidex.Infrastructure/Squidex.Infrastructure.csproj

@ -27,7 +27,7 @@
<PackageReference Include="Squidex.Caching" Version="1.9.0" /> <PackageReference Include="Squidex.Caching" Version="1.9.0" />
<PackageReference Include="Squidex.Hosting.Abstractions" Version="2.13.0" /> <PackageReference Include="Squidex.Hosting.Abstractions" Version="2.13.0" />
<PackageReference Include="Squidex.Log" Version="1.6.0" /> <PackageReference Include="Squidex.Log" Version="1.6.0" />
<PackageReference Include="Squidex.Messaging" Version="1.7.0" /> <PackageReference Include="Squidex.Messaging" Version="2.1.0" />
<PackageReference Include="Squidex.Text" Version="1.7.0" /> <PackageReference Include="Squidex.Text" Version="1.7.0" />
<PackageReference Include="StyleCop.Analyzers" Version="1.1.118" PrivateAssets="all" /> <PackageReference Include="StyleCop.Analyzers" Version="1.1.118" PrivateAssets="all" />
<PackageReference Include="System.Collections.Immutable" Version="6.0.0" /> <PackageReference Include="System.Collections.Immutable" Version="6.0.0" />

Loading…
Cancel
Save