forked from serilog/serilog
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request serilog#925 from nblumhardt/filter-config
Refactor key-value settings to consistently apply configuration methods
- Loading branch information
Showing
6 changed files
with
263 additions
and
213 deletions.
There are no files selected for viewing
52 changes: 52 additions & 0 deletions
52
src/Serilog/Settings/KeyValuePairs/CallableConfigurationMethodFinder.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,52 @@ | ||
| // Copyright 2013-2015 Serilog Contributors | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
|
|
||
| using Serilog.Configuration; | ||
| using System; | ||
| using System.Collections.Generic; | ||
| using System.Linq; | ||
| using System.Reflection; | ||
| using System.Runtime.CompilerServices; | ||
|
|
||
| namespace Serilog.Settings.KeyValuePairs | ||
| { | ||
| static class CallableConfigurationMethodFinder | ||
| { | ||
| internal static LoggerConfiguration FromLogContext(LoggerEnrichmentConfiguration loggerEnrichmentConfiguration) | ||
| { | ||
| return loggerEnrichmentConfiguration.FromLogContext(); | ||
| } | ||
|
|
||
| static readonly MethodInfo SurrogateFromLogContextConfigurationMethod = typeof(CallableConfigurationMethodFinder).GetTypeInfo().DeclaredMethods.Single(m => m.Name == nameof(FromLogContext)); | ||
|
|
||
| internal static IList<MethodInfo> FindConfigurationMethods(IEnumerable<Assembly> configurationAssemblies, Type configType) | ||
| { | ||
| var methods = configurationAssemblies | ||
| .SelectMany(a => a.ExportedTypes | ||
| .Select(t => t.GetTypeInfo()) | ||
| .Where(t => t.IsSealed && t.IsAbstract && !t.IsNested)) | ||
| .SelectMany(t => t.DeclaredMethods) | ||
| .Where(m => m.IsStatic && m.IsPublic && m.IsDefined(typeof(ExtensionAttribute), false)) | ||
| .Where(m => m.GetParameters()[0].ParameterType == configType) | ||
| .ToList(); | ||
|
|
||
| // Unlike the other configuration methods, FromLogContext is an instance method rather than an extension. This | ||
| // hack ensures we find it. | ||
| if (configType == typeof(LoggerEnrichmentConfiguration)) | ||
| methods.Add(SurrogateFromLogContextConfigurationMethod); | ||
|
|
||
| return methods; | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
76 changes: 76 additions & 0 deletions
76
src/Serilog/Settings/KeyValuePairs/SettingValueConversions.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,76 @@ | ||
| // Copyright 2013-2015 Serilog Contributors | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
|
|
||
| using System; | ||
| using System.Collections.Generic; | ||
| using System.Linq; | ||
| using System.Reflection; | ||
|
|
||
| namespace Serilog.Settings.KeyValuePairs | ||
| { | ||
| class SettingValueConversions | ||
| { | ||
| static Dictionary<Type, Func<string, object>> ExtendedTypeConversions = new Dictionary<Type, Func<string, object>> | ||
| { | ||
| { typeof(Uri), s => new Uri(s) }, | ||
| { typeof(TimeSpan), s => TimeSpan.Parse(s) } | ||
| }; | ||
|
|
||
| public static object ConvertToType(string value, Type toType) | ||
| { | ||
| var toTypeInfo = toType.GetTypeInfo(); | ||
| if (toTypeInfo.IsGenericType && toType.GetGenericTypeDefinition() == typeof(Nullable<>)) | ||
| { | ||
| if (string.IsNullOrEmpty(value)) | ||
| return null; | ||
|
|
||
| // unwrap Nullable<> type since we're not handling null situations | ||
| toType = toTypeInfo.GenericTypeArguments[0]; | ||
| toTypeInfo = toType.GetTypeInfo(); | ||
| } | ||
|
|
||
| if (toTypeInfo.IsEnum) | ||
| return Enum.Parse(toType, value); | ||
|
|
||
| var convertor = ExtendedTypeConversions | ||
| .Where(t => t.Key.GetTypeInfo().IsAssignableFrom(toTypeInfo)) | ||
| .Select(t => t.Value) | ||
| .FirstOrDefault(); | ||
|
|
||
| if (convertor != null) | ||
| return convertor(value); | ||
|
|
||
| if (toTypeInfo.IsInterface && !string.IsNullOrWhiteSpace(value)) | ||
| { | ||
| var type = Type.GetType(value.Trim(), throwOnError: false); | ||
| if (type != null) | ||
| { | ||
| var ctor = type.GetTypeInfo().DeclaredConstructors.FirstOrDefault(ci => | ||
| { | ||
| var parameters = ci.GetParameters(); | ||
| return parameters.Length == 0 || parameters.All(pi => pi.HasDefaultValue); | ||
| }); | ||
|
|
||
| if (ctor == null) | ||
| throw new InvalidOperationException($"A default constructor was not found on {type.FullName}."); | ||
|
|
||
| var call = ctor.GetParameters().Select(pi => pi.DefaultValue).ToArray(); | ||
| return ctor.Invoke(call); | ||
| } | ||
| } | ||
|
|
||
| return Convert.ChangeType(value, toType); | ||
| } | ||
| } | ||
| } |
Oops, something went wrong.