Skip to content

Commit

Permalink
Corrected Wording and naming of classes from @nblumhardt
Browse files Browse the repository at this point in the history
- Descriptions in project.json for packages
- Missing Logger in extension classes
- Renamed old FullNet extension
  • Loading branch information
merbla committed Jan 22, 2016
1 parent 309becf commit db29dd1
Show file tree
Hide file tree
Showing 12 changed files with 20 additions and 20 deletions.
2 changes: 1 addition & 1 deletion src/Serilog.Sinks.Console/project.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"version": "2.0.0-beta-*",
"description": "The console sink for Serilog - Simple .NET logging with fully-structured events",
"description": "The console sink for Serilog.",
"authors": [ "Serilog Contributors" ],
"tags": [ "serilog", "console" ],
"projectUrl": "http://serilog.net",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

namespace Serilog
{
public static class DiagnosticTraceConfigurationExtensions
public static class DiagnosticTraceLoggerConfigurationExtensions
{
/// <summary>
/// Write log events to the <see cref="System.Diagnostics.Trace"/>.
Expand All @@ -39,7 +39,7 @@ public static class DiagnosticTraceConfigurationExtensions
public static LoggerConfiguration Trace(
this LoggerSinkConfiguration sinkConfiguration,
LogEventLevel restrictedToMinimumLevel = LevelAlias.Minimum,
string outputTemplate = LoggerConfigurationFullNetFxExtensions.DefaultOutputTemplate,
string outputTemplate = LoggerConfigurationExtensions.DefaultOutputTemplate,
IFormatProvider formatProvider = null,
LoggingLevelSwitch levelSwitch = null)
{
Expand Down
2 changes: 1 addition & 1 deletion src/Serilog.Sinks.DiagnosticTrace/project.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"version": "2.0.0-beta-*",
"description": "The diagnostic trace sink for Serilog - Simple .NET logging with fully-structured events",
"description": "The diagnostic trace sink for Serilog.",
"authors": [ "Serilog Contributors" ],
"tags": [ "serilog", "trace", "diagnostic" ],
"projectUrl": "http://serilog.net",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

namespace Serilog
{
public static class IOFileConfigurationExtensions
public static class IOFileLoggerConfigurationExtensions
{
/// <summary>
/// Write log events to the specified file.
Expand All @@ -44,9 +44,9 @@ public static LoggerConfiguration File(
this LoggerSinkConfiguration sinkConfiguration,
string path,
LogEventLevel restrictedToMinimumLevel = LevelAlias.Minimum,
string outputTemplate = LoggerConfigurationFullNetFxExtensions.DefaultOutputTemplate,
string outputTemplate = LoggerConfigurationExtensions.DefaultOutputTemplate,
IFormatProvider formatProvider = null,
long? fileSizeLimitBytes = LoggerConfigurationFullNetFxExtensions.DefaultFileSizeLimitBytes,
long? fileSizeLimitBytes = LoggerConfigurationExtensions.DefaultFileSizeLimitBytes,
LoggingLevelSwitch levelSwitch = null)
{
if (sinkConfiguration == null) throw new ArgumentNullException(nameof(sinkConfiguration));
Expand Down
2 changes: 1 addition & 1 deletion src/Serilog.Sinks.IOFile/project.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"version": "2.0.0-beta-*",
"description": "The file sink for Serilog - Simple .NET logging with fully-structured events",
"description": "The file sink for Serilog",
"authors": [ "Serilog Contributors" ],
"tags": [ "serilog", "file", "io" ],
"projectUrl": "http://serilog.net",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

namespace Serilog
{
public static class IOTextWriterConfigurationExtensions
public static class IOTextWriterLoggerConfigurationExtensions
{
/// <summary>
/// Write log events to the provided <see cref="TextWriter"/>.
Expand All @@ -27,7 +27,7 @@ public static LoggerConfiguration TextWriter(
this LoggerSinkConfiguration sinkConfiguration,
TextWriter textWriter,
LogEventLevel restrictedToMinimumLevel = LevelAlias.Minimum,
string outputTemplate = LoggerConfigurationFullNetFxExtensions.DefaultOutputTemplate,
string outputTemplate = LoggerConfigurationExtensions.DefaultOutputTemplate,
IFormatProvider formatProvider = null,
LoggingLevelSwitch levelSwitch = null)
{
Expand Down
6 changes: 3 additions & 3 deletions src/Serilog.Sinks.IOTextWriter/project.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"version": "2.0.0-beta-*",
"description": "The IO Text Writer sink for Serilog - Simple .NET logging with fully-structured events",
"description": "The System.IO.TextWriter sink for Serilog",
"authors": [ "Serilog Contributors" ],
"tags": [ "serilog", "IO", "text", "writer"],
"tags": [ "serilog", "IO", "text", "writer" ],
"projectUrl": "http://serilog.net",
"licenseUrl": "http://www.apache.org/licenses/LICENSE-2.0",
"iconUrl": "http://serilog.net/images/serilog-sink-nuget.png",
Expand All @@ -14,7 +14,7 @@
},
"frameworks": {
"net45": {
},
},
"dotnet5.1": {
"dependencies": {
"System.IO": "4.0.11-beta-23516"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

namespace Serilog
{
public static class ObservableConfigurationExtensions
public static class ObservableLoggerConfigurationExtensions
{
/// <summary>
/// Write events to Rx observers.
Expand Down
2 changes: 1 addition & 1 deletion src/Serilog.Sinks.Observable/project.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"version": "2.0.0-beta-*",
"description": "The observable sink for Serilog - Simple .NET logging with fully-structured events",
"description": "The observable sink for Serilog.",
"authors": [ "Serilog Contributors" ],
"tags": [ "serilog", "observable", "reactive" ],
"projectUrl": "http://serilog.net",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

namespace Serilog.Sinks.RollingFile
{
public static class RollingFileConfigurationExtensions
public static class RollingFileLoggerConfigurationExtensions
{
const int DefaultRetainedFileCountLimit = 31; // A long month of logs

Expand Down Expand Up @@ -36,9 +36,9 @@ public static LoggerConfiguration RollingFile(
this LoggerSinkConfiguration sinkConfiguration,
string pathFormat,
LogEventLevel restrictedToMinimumLevel = LevelAlias.Minimum,
string outputTemplate = LoggerConfigurationFullNetFxExtensions.DefaultOutputTemplate,
string outputTemplate = LoggerConfigurationExtensions.DefaultOutputTemplate,
IFormatProvider formatProvider = null,
long? fileSizeLimitBytes = LoggerConfigurationFullNetFxExtensions.DefaultFileSizeLimitBytes,
long? fileSizeLimitBytes = LoggerConfigurationExtensions.DefaultFileSizeLimitBytes,
int? retainedFileCountLimit = DefaultRetainedFileCountLimit,
LoggingLevelSwitch levelSwitch = null)
{
Expand Down
2 changes: 1 addition & 1 deletion src/Serilog/Context/LogContext.cs
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ namespace Serilog.Context
{
/// <summary>
/// Holds ambient properties that can be attached to log events. To
/// configure, use the <see cref="LoggerConfigurationFullNetFxExtensions.FromLogContext"/>
/// configure, use the <see cref="LoggerConfigurationExtensions.FromLogContext"/>
/// extension method.
/// </summary>
/// <example>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ namespace Serilog
/// Extends <see cref="LoggerConfiguration"/> to add Full .NET Framework
/// capabilities.
/// </summary>
public static class LoggerConfigurationFullNetFxExtensions
public static class LoggerConfigurationFxExtensions
{
//TODO: Need to confirm this is the best location for this default. Used in File, Trace, RollingFile. Do we move this to each sink?
public const string DefaultOutputTemplate = "{Timestamp:yyyy-MM-dd HH:mm:ss.fff zzz} [{Level}] {Message}{NewLine}{Exception}";
Expand Down

0 comments on commit db29dd1

Please sign in to comment.