Skip to content
This repository was archived by the owner on May 17, 2019. It is now read-only.

Commit 4f8e7f3

Browse files
dtillmandtillman
committed
Add Stylecop
1 parent a81a9eb commit 4f8e7f3

11 files changed

+43
-38
lines changed

‎.travis.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@ env:
55
- DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
66
- DOTNET_CLI_TELEMETRY_OPTOUT: 1
77
mono: none
8-
dotnet: 2.0.0
8+
dotnet: 2.0.3
99
os:
1010
- linux
1111
- osx
12-
osx_image: xcode8.2
12+
osx_image: xcode8.3
1313
branches:
1414
only:
1515
- master

‎config/versions-dev.props‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,9 @@
66
<AspNetCoreTestVersion>2.0.0</AspNetCoreTestVersion>
77
<AspNetCoreMvcTestVersion>2.0.0</AspNetCoreMvcTestVersion>
88
<CoreFxVersion>4.4.0</CoreFxVersion>
9-
<JsonNetVersion>10.0.1</JsonNetVersion>
10-
<TestSdkVersion>15.3.0</TestSdkVersion>
9+
<StyleCopVersion>1.0.2</StyleCopVersion>
10+
<JsonNetVersion>10.0.3</JsonNetVersion>
11+
<TestSdkVersion>15.5.0</TestSdkVersion>
1112
<XunitVersion>2.3.1</XunitVersion>
1213
<XunitStudioVersion>2.3.1</XunitStudioVersion>
1314
</PropertyGroup>

‎config/versions-master.props‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,9 @@
66
<AspNetCoreTestVersion>2.0.0</AspNetCoreTestVersion>
77
<AspNetCoreMvcTestVersion>2.0.0</AspNetCoreMvcTestVersion>
88
<CoreFxVersion>4.4.0</CoreFxVersion>
9-
<JsonNetVersion>10.0.1</JsonNetVersion>
10-
<TestSdkVersion>15.3.0</TestSdkVersion>
9+
<StyleCopVersion>1.0.2</StyleCopVersion>
10+
<JsonNetVersion>10.0.3</JsonNetVersion>
11+
<TestSdkVersion>15.5.0</TestSdkVersion>
1112
<XunitVersion>2.3.1</XunitVersion>
1213
<XunitStudioVersion>2.3.1</XunitStudioVersion>
1314
</PropertyGroup>

‎config/versions.props‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,9 @@
66
<AspNetCoreTestVersion>2.0.0</AspNetCoreTestVersion>
77
<AspNetCoreMvcTestVersion>2.0.0</AspNetCoreMvcTestVersion>
88
<CoreFxVersion>4.4.0</CoreFxVersion>
9-
<JsonNetVersion>10.0.1</JsonNetVersion>
10-
<TestSdkVersion>15.3.0</TestSdkVersion>
9+
<StyleCopVersion>1.0.2</StyleCopVersion>
10+
<JsonNetVersion>10.0.3</JsonNetVersion>
11+
<TestSdkVersion>15.5.0</TestSdkVersion>
1112
<XunitVersion>2.3.1</XunitVersion>
1213
<XunitStudioVersion>2.3.1</XunitStudioVersion>
1314
</PropertyGroup>

‎src/Steeltoe.Extensions.Logging.DynamicLogger/DynamicLoggerConfigurationExtensions.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,13 +50,13 @@ public static ConsoleLoggerSettings FromConfiguration(this ConsoleLoggerSettings
5050
return settings;
5151
}
5252

53-
private static void AddSwitches(IEnumerable<IConfigurationSection> settings, IDictionary<string, LogLevel> Switches)
53+
private static void AddSwitches(IEnumerable<IConfigurationSection> settings, IDictionary<string, LogLevel> switches)
5454
{
5555
foreach (var setting in settings)
5656
{
5757
try
5858
{
59-
Switches[setting.Key] = (LogLevel)Enum.Parse(typeof(LogLevel), setting.Value);
59+
switches[setting.Key] = (LogLevel)Enum.Parse(typeof(LogLevel), setting.Value);
6060
}
6161
catch
6262
{

‎src/Steeltoe.Extensions.Logging.DynamicLogger/DynamicLoggerProvider.cs‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,12 @@ namespace Steeltoe.Extensions.Logging
2525
[ProviderAlias("Dynamic")]
2626
public class DynamicLoggerProvider : IDynamicLoggerProvider
2727
{
28-
private Func<string, LogLevel, bool> _filter;
29-
private ConcurrentDictionary<string, Func<string, LogLevel, bool>> _runningFilters = new ConcurrentDictionary<string, Func<string, LogLevel, bool>>();
3028
private static readonly Func<string, LogLevel, bool> _trueFilter = (cat, level) => true;
3129
private static readonly Func<string, LogLevel, bool> _falseFilter = (cat, level) => false;
3230

31+
private Func<string, LogLevel, bool> _filter;
32+
private ConcurrentDictionary<string, Func<string, LogLevel, bool>> _runningFilters = new ConcurrentDictionary<string, Func<string, LogLevel, bool>>();
33+
3334
private ConcurrentDictionary<string, ConsoleLogger> _loggers = new ConcurrentDictionary<string, ConsoleLogger>();
3435
private ConsoleLoggerProvider _delegate;
3536
private IConsoleLoggerSettings _settings;

‎src/Steeltoe.Extensions.Logging.DynamicLogger/Steeltoe.Extensions.Logging.DynamicLogger.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
<PackageReference Include="Microsoft.Extensions.Configuration" Version="$(AspNetCoreVersion)" />
2727
<PackageReference Include="Microsoft.Extensions.Logging" Version="$(AspNetCoreVersion)" />
2828
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="$(AspNetCoreVersion)" />
29-
<PackageReference Include="StyleCop.Analyzers" Version="1.0.2">
29+
<PackageReference Include="StyleCop.Analyzers" Version="$(StyleCopVersion)">
3030
<PrivateAssets>All</PrivateAssets>
3131
</PackageReference>
3232
</ItemGroup>
@@ -38,7 +38,7 @@
3838
</ItemGroup>
3939

4040
<PropertyGroup>
41-
<NoWarn>SA1100;SA1101;SA1124;SA1202;SA1204;SA1309;SA1310;SA1313;SA1600;SA1611;1591;1701;1702;1705</NoWarn>
41+
<NoWarn>SA1101;SA1124;SA1201;SA1309;SA1310;SA1401;SA1600;SA1652;1591</NoWarn>
4242
</PropertyGroup>
4343
<ItemGroup>
4444
<AdditionalFiles Include="..\..\stylecop.json">

‎test/Steeltoe.Extensions.Logging.DynamicLogger.Test/DynamicLoggerConfigurationExtensionsTest.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ public void FromConfiguration_Parses_Correctly()
4747
Assert.Equal(LogLevel.Information, settings.Switches["Steeltoe"]);
4848
Assert.Equal(LogLevel.Trace, settings.Switches["Steeltoe.Extensions"]);
4949
}
50+
5051
[Fact]
5152
public void FromConfiguration_NoError_When_NotConfigured()
5253
{

‎test/Steeltoe.Extensions.Logging.DynamicLogger.Test/DynamicLoggerProviderTest.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ public void SetLogLevel_UpdatesNamespaceDescendants()
8686
Assert.Equal(LogLevel.Trace, tierTwoNamespace.EffectiveLevel);
8787
Assert.True(childLogger.IsEnabled(LogLevel.Trace));
8888

89-
// act III: set A to something else, make sure it inherits down
89+
// act III: set A to something else, make sure it inherits down
9090
provider.SetLogLevel("A", LogLevel.Error);
9191
configurations = provider.GetLoggerConfigurations();
9292
tierOneNamespace = configurations.First(n => n.Name == "A");

‎test/Steeltoe.Extensions.Logging.DynamicLogger.Test/DynamicLoggingBuilderTest.cs‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -35,13 +35,13 @@ public class DynamicLoggingBuilderTest
3535
public void OnlyApplicableFilters_AreApplied()
3636
{
3737
// arrange
38-
var _appsettings = new Dictionary<string, string>()
38+
var appsettings = new Dictionary<string, string>()
3939
{
4040
["Logging:IncludeScopes"] = "false",
4141
["Logging:LogLevel:Default"] = "Information",
4242
["Logging:foo:LogLevel:A.B.C.D.TestClass"] = "None"
4343
};
44-
var configuration = new ConfigurationBuilder().AddInMemoryCollection(_appsettings).Build();
44+
var configuration = new ConfigurationBuilder().AddInMemoryCollection(appsettings).Build();
4545
var services = new ServiceCollection()
4646
.AddLogging(builder =>
4747
{
@@ -55,8 +55,8 @@ public void OnlyApplicableFilters_AreApplied()
5555

5656
// assert
5757
Assert.NotNull(logger);
58-
Assert.True((logger).IsEnabled(LogLevel.Information), "Information level should be enabled");
59-
Assert.False((logger).IsEnabled(LogLevel.Debug), "Debug level should NOT be enabled");
58+
Assert.True(logger.IsEnabled(LogLevel.Information), "Information level should be enabled");
59+
Assert.False(logger.IsEnabled(LogLevel.Debug), "Debug level should NOT be enabled");
6060
}
6161

6262
[Fact]
@@ -77,16 +77,16 @@ public void DynamicLevelSetting_WorksWith_ConsoleFilters()
7777

7878
// assert
7979
Assert.NotNull(logger);
80-
Assert.True((logger).IsEnabled(LogLevel.Critical), "Critical level should be enabled");
81-
Assert.False((logger).IsEnabled(LogLevel.Error), "Error level should NOT be enabled");
82-
Assert.False((logger).IsEnabled(LogLevel.Warning), "Warning level should NOT be enabled");
83-
Assert.False((logger).IsEnabled(LogLevel.Debug), "Debug level should NOT be enabled");
84-
Assert.False((logger).IsEnabled(LogLevel.Trace), "Trace level should NOT be enabled yet");
80+
Assert.True(logger.IsEnabled(LogLevel.Critical), "Critical level should be enabled");
81+
Assert.False(logger.IsEnabled(LogLevel.Error), "Error level should NOT be enabled");
82+
Assert.False(logger.IsEnabled(LogLevel.Warning), "Warning level should NOT be enabled");
83+
Assert.False(logger.IsEnabled(LogLevel.Debug), "Debug level should NOT be enabled");
84+
Assert.False(logger.IsEnabled(LogLevel.Trace), "Trace level should NOT be enabled yet");
8585

8686
// change the log level and confirm it worked
8787
var provider = services.GetRequiredService(typeof(ILoggerProvider)) as DynamicLoggerProvider;
8888
provider.SetLogLevel("A.B.C.D", LogLevel.Trace);
89-
Assert.True((logger).IsEnabled(LogLevel.Trace), "Trace level should have been enabled");
89+
Assert.True(logger.IsEnabled(LogLevel.Trace), "Trace level should have been enabled");
9090
}
9191

9292
[Fact]
@@ -167,14 +167,14 @@ public void DynamicLevelSetting_ParmLessAddDynamic_NotBrokenByAddConfiguration()
167167

168168
// assert
169169
Assert.NotNull(logger);
170-
Assert.True((logger).IsEnabled(LogLevel.Warning), "Warning level should be enabled");
171-
Assert.False((logger).IsEnabled(LogLevel.Debug), "Debug level should NOT be enabled");
172-
Assert.False((logger).IsEnabled(LogLevel.Trace), "Trace level should not be enabled yet");
170+
Assert.True(logger.IsEnabled(LogLevel.Warning), "Warning level should be enabled");
171+
Assert.False(logger.IsEnabled(LogLevel.Debug), "Debug level should NOT be enabled");
172+
Assert.False(logger.IsEnabled(LogLevel.Trace), "Trace level should not be enabled yet");
173173

174174
// change the log level and confirm it worked
175175
var provider = services.GetRequiredService(typeof(ILoggerProvider)) as DynamicLoggerProvider;
176176
provider.SetLogLevel("Steeltoe.Extensions.Logging.Test", LogLevel.Trace);
177-
Assert.True((logger).IsEnabled(LogLevel.Trace), "Trace level should have been enabled");
177+
Assert.True(logger.IsEnabled(LogLevel.Trace), "Trace level should have been enabled");
178178
}
179179

180180
[Fact]
@@ -195,14 +195,14 @@ public void DynamicLevelSetting_WithParmsAddDynamic_NotBrokenByAddConfiguration(
195195

196196
// assert
197197
Assert.NotNull(logger);
198-
Assert.True((logger).IsEnabled(LogLevel.Warning), "Warning level should be enabled");
199-
Assert.False((logger).IsEnabled(LogLevel.Debug), "Debug level should NOT be enabled");
200-
Assert.False((logger).IsEnabled(LogLevel.Trace), "Trace level should not be enabled yet");
198+
Assert.True(logger.IsEnabled(LogLevel.Warning), "Warning level should be enabled");
199+
Assert.False(logger.IsEnabled(LogLevel.Debug), "Debug level should NOT be enabled");
200+
Assert.False(logger.IsEnabled(LogLevel.Trace), "Trace level should not be enabled yet");
201201

202202
// change the log level and confirm it worked
203203
var provider = services.GetRequiredService(typeof(ILoggerProvider)) as DynamicLoggerProvider;
204204
provider.SetLogLevel("Steeltoe.Extensions.Logging.Test", LogLevel.Trace);
205-
Assert.True((logger).IsEnabled(LogLevel.Trace), "Trace level should have been enabled");
205+
Assert.True(logger.IsEnabled(LogLevel.Trace), "Trace level should have been enabled");
206206
}
207207
}
208208
}

0 commit comments

Comments
 (0)