Browse Source

Merge branch 'release/4.x'

pull/593/head
Sebastian 5 years ago
parent
commit
1a68cb12f6
  1. 10
      backend/src/Squidex.Domain.Apps.Entities/Rules/RuleDequeuerGrain.cs
  2. 15
      backend/tests/Squidex.Domain.Apps.Entities.Tests/Rules/RuleDequeuerGrainTests.cs

10
backend/src/Squidex.Domain.Apps.Entities/Rules/RuleDequeuerGrain.cs

@ -116,6 +116,16 @@ namespace Squidex.Domain.Apps.Entities.Rules
}; };
await ruleEventRepository.UpdateAsync(@event.Job, update); await ruleEventRepository.UpdateAsync(@event.Job, update);
if (response.Status == RuleResult.Failed)
{
log.LogWarning(response.Exception!, w => w
.WriteProperty("action", "SendRuleEvent")
.WriteProperty("status", "Failed")
.WriteProperty("ruleId", @event.Job.RuleId.ToString())
.WriteProperty("ruleDescription", @event.Job.Description)
.WriteProperty("dump", response.Dump));
}
} }
catch (Exception ex) catch (Exception ex)
{ {

15
backend/tests/Squidex.Domain.Apps.Entities.Tests/Rules/RuleDequeuerTests.cs → backend/tests/Squidex.Domain.Apps.Entities.Tests/Rules/RuleDequeuerGrainTests.cs

@ -20,7 +20,7 @@ using Xunit;
namespace Squidex.Domain.Apps.Entities.Rules namespace Squidex.Domain.Apps.Entities.Rules
{ {
public class RuleDequeuerTests public class RuleDequeuerGrainTests
{ {
private readonly IClock clock = A.Fake<IClock>(); private readonly IClock clock = A.Fake<IClock>();
private readonly ISemanticLog log = A.Dummy<ISemanticLog>(); private readonly ISemanticLog log = A.Dummy<ISemanticLog>();
@ -28,7 +28,7 @@ namespace Squidex.Domain.Apps.Entities.Rules
private readonly RuleService ruleService = A.Fake<RuleService>(); private readonly RuleService ruleService = A.Fake<RuleService>();
private readonly RuleDequeuerGrain sut; private readonly RuleDequeuerGrain sut;
public RuleDequeuerTests() public RuleDequeuerGrainTests()
{ {
A.CallTo(() => clock.GetCurrentInstant()) A.CallTo(() => clock.GetCurrentInstant())
.Returns(SystemClock.Instance.GetCurrentInstant().WithoutMs()); .Returns(SystemClock.Instance.GetCurrentInstant().WithoutMs());
@ -126,6 +126,17 @@ namespace Squidex.Domain.Apps.Entities.Rules
await sut.HandleAsync(@event); await sut.HandleAsync(@event);
if (result == RuleResult.Failed)
{
A.CallTo(() => log.Log(SemanticLogLevel.Warning, A<Exception?>._, A<LogFormatter>._))
.MustHaveHappened();
}
else
{
A.CallTo(() => log.Log(SemanticLogLevel.Warning, A<Exception?>._, A<LogFormatter>._))
.MustNotHaveHappened();
}
A.CallTo(() => ruleEventRepository.UpdateAsync(@event.Job, A.CallTo(() => ruleEventRepository.UpdateAsync(@event.Job,
A<RuleJobUpdate>.That.Matches(x => A<RuleJobUpdate>.That.Matches(x =>
x.Elapsed == requestElapsed && x.Elapsed == requestElapsed &&
Loading…
Cancel
Save