Skip to content

Commit

Permalink
re #18096 - Updates to EMG.Extensions.Logging.Loggly to avoid Mapping…
Browse files Browse the repository at this point in the history
…Conflict with Nybus v0 (#3)

- changing naming Event to EventId, since it's breaking Loggly
  • Loading branch information
frankie87 authored Sep 25, 2020
1 parent e1d7987 commit e4f5462
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion src/Logging/Loggly/Loggly/LogglyHttpClient.cs
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ private static LogglyMessage CloneLogglyEvent(LogglyMessage logglyMessage, objec
Category = logglyMessage.Category,
Data = newData,
Error = logglyMessage.Error,
Event = logglyMessage.Event,
EventId = logglyMessage.EventId,
Level = logglyMessage.Level,
MachineName = logglyMessage.MachineName,
Message = logglyMessage.Message
Expand Down
2 changes: 1 addition & 1 deletion src/Logging/Loggly/Loggly/LogglyLogger.cs
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ public void Log<TState>(LogLevel logLevel, EventId eventId, TState state, Except
MachineName = Environment.MachineName,
Category = Name,
Data = state,
Event = eventId,
EventId = eventId,
Message = message,
Level = logLevel,
Error = FormatException(exception)
Expand Down
2 changes: 1 addition & 1 deletion src/Logging/Loggly/Loggly/LogglyMessage.cs
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ public class LogglyMessage

public string Category { get; set; }

public EventId Event { get; set; }
public EventId EventId { get; set; }

public string Message { get; set; }

Expand Down
2 changes: 1 addition & 1 deletion tests/Logging/Tests.Loggly/Loggly/LogglyLoggerTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ public void Logs_are_packed_into_LogglyMessage([Frozen] ILogglyProcessor process

sut.Log(level, eventId, state, error, formatter);

Mock.Get(processor).Verify(p => p.EnqueueMessage(It.Is<LogglyMessage>(m => m.Level == level && m.Category == sut.Name && m.Event == eventId && m.Data == state && m.Message == message)));
Mock.Get(processor).Verify(p => p.EnqueueMessage(It.Is<LogglyMessage>(m => m.Level == level && m.Category == sut.Name && m.EventId == eventId && m.Data == state && m.Message == message)));
}

[Test, AutoMoqData]
Expand Down

0 comments on commit e4f5462

Please sign in to comment.