From 09d255e06f6816a52a4967bb45415543370e6cac Mon Sep 17 00:00:00 2001 From: Matt Cole Date: Tue, 16 Feb 2021 23:05:03 +0000 Subject: [PATCH] Fix ReSharper warnings --- src/Gelf.Extensions.Logging/HttpGelfClient.cs | 7 ++----- test/Gelf.Extensions.Logging.Tests/GelfLoggerTests.cs | 5 ++++- test/Gelf.Extensions.Logging.Tests/HttpGelfLoggerTests.cs | 2 +- test/Gelf.Extensions.Logging.Tests/UdpGelfLoggerTests.cs | 4 +++- 4 files changed, 10 insertions(+), 8 deletions(-) diff --git a/src/Gelf.Extensions.Logging/HttpGelfClient.cs b/src/Gelf.Extensions.Logging/HttpGelfClient.cs index 27c6366..75324e0 100644 --- a/src/Gelf.Extensions.Logging/HttpGelfClient.cs +++ b/src/Gelf.Extensions.Logging/HttpGelfClient.cs @@ -24,12 +24,9 @@ public HttpGelfClient(GelfLoggerOptions options) Timeout = options.HttpTimeout }; - if (options.HttpHeaders != null) + foreach (var header in options.HttpHeaders) { - foreach (var header in options.HttpHeaders) - { - _httpClient.DefaultRequestHeaders.Add(header.Key, header.Value); - } + _httpClient.DefaultRequestHeaders.Add(header.Key, header.Value); } } diff --git a/test/Gelf.Extensions.Logging.Tests/GelfLoggerTests.cs b/test/Gelf.Extensions.Logging.Tests/GelfLoggerTests.cs index f362ab3..bd58cfd 100644 --- a/test/Gelf.Extensions.Logging.Tests/GelfLoggerTests.cs +++ b/test/Gelf.Extensions.Logging.Tests/GelfLoggerTests.cs @@ -7,6 +7,9 @@ using Microsoft.Extensions.Logging; using Xunit; +// ReSharper disable TemplateIsNotCompileTimeConstantProblem +// ReSharper disable InconsistentLogPropertyNaming + namespace Gelf.Extensions.Logging.Tests { public abstract class GelfLoggerTests : IDisposable @@ -39,7 +42,7 @@ public async Task Sends_message_to_Graylog(LogLevel logLevel, int expectedLevel) var messageText = Faker.Lorem.Sentence(); var sut = LoggerFixture.CreateLogger(); - sut.Log(logLevel, new EventId(), (object) null, null, (s, e) => messageText); + sut.Log(logLevel, new EventId(), (object) null, null, (_, _) => messageText); var message = await GraylogFixture.WaitForMessageAsync(); diff --git a/test/Gelf.Extensions.Logging.Tests/HttpGelfLoggerTests.cs b/test/Gelf.Extensions.Logging.Tests/HttpGelfLoggerTests.cs index fc1bc77..5d7ee5e 100644 --- a/test/Gelf.Extensions.Logging.Tests/HttpGelfLoggerTests.cs +++ b/test/Gelf.Extensions.Logging.Tests/HttpGelfLoggerTests.cs @@ -11,7 +11,7 @@ public HttpGelfLoggerTests(HttpGraylogFixture graylogFixture) : base(graylogFixt Host = GraylogFixture.Host, Port = graylogFixture.InputPort, Protocol = GelfProtocol.Http, - LogSource = typeof(HttpGelfLoggerTests).Name + LogSource = nameof(HttpGelfLoggerTests) })) { } diff --git a/test/Gelf.Extensions.Logging.Tests/UdpGelfLoggerTests.cs b/test/Gelf.Extensions.Logging.Tests/UdpGelfLoggerTests.cs index d22c7b3..319d13e 100644 --- a/test/Gelf.Extensions.Logging.Tests/UdpGelfLoggerTests.cs +++ b/test/Gelf.Extensions.Logging.Tests/UdpGelfLoggerTests.cs @@ -3,6 +3,8 @@ using Microsoft.Extensions.Logging; using Xunit; +// ReSharper disable TemplateIsNotCompileTimeConstantProblem + namespace Gelf.Extensions.Logging.Tests { public class UdpGelfLoggerTests : GelfLoggerTests, IClassFixture @@ -13,7 +15,7 @@ public UdpGelfLoggerTests(UdpGraylogFixture graylogFixture) : base(graylogFixtur Host = GraylogFixture.Host, Port = graylogFixture.InputPort, Protocol = GelfProtocol.Udp, - LogSource = typeof(UdpGelfLoggerTests).Name + LogSource = nameof(UdpGelfLoggerTests) })) { }