-
Notifications
You must be signed in to change notification settings - Fork 30
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 #96 from serilog/dev
2.0.0 Release
- Loading branch information
Showing
22 changed files
with
795 additions
and
825 deletions.
There are no files selected for viewing
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
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
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 |
|---|---|---|
| @@ -1,22 +1,22 @@ | ||
| version: '{build}' | ||
| skip_tags: true | ||
| image: Visual Studio 2019 | ||
| image: Visual Studio 2022 | ||
| build_script: | ||
| - ps: ./Build.ps1 | ||
| - pwsh: ./Build.ps1 | ||
| test: off | ||
| artifacts: | ||
| - path: artifacts/Serilog.*.nupkg | ||
| deploy: | ||
| - provider: NuGet | ||
| api_key: | ||
| secure: rbdBqxBpLt4MkB+mrDOYNDOd8aVZ1zMkysaVNAXNKnC41FYifzX3l9LM8DCrUWU5 | ||
| secure: ZpUO4ECx4c/V0Ecj04cfV1UGd+ZABeEG9DDW2fjG8vITjNYhmbiiJH0qNOnRy2G3 | ||
| skip_symbols: true | ||
| on: | ||
| branch: /^(master|dev)$/ | ||
| branch: /^(main|dev)$/ | ||
| - provider: GitHub | ||
| auth_token: | ||
| secure: p4LpVhBKxGS5WqucHxFQ5c7C8cP74kbNB0Z8k9Oxx/PMaDQ1+ibmoexNqVU5ZlmX | ||
| artifact: /Serilog.*\.nupkg/ | ||
| tag: v$(appveyor_build_version) | ||
| on: | ||
| branch: master | ||
| branch: main |
113 changes: 42 additions & 71 deletions
113
src/Serilog.Sinks.Async/LoggerConfigurationAsyncExtensions.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 |
|---|---|---|
| @@ -1,80 +1,51 @@ | ||
| using System; | ||
| using System.ComponentModel; | ||
| // Copyright © 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 Serilog.Configuration; | ||
| using Serilog.Sinks.Async; | ||
| using Serilog.Events; | ||
|
|
||
| namespace Serilog | ||
| namespace Serilog; | ||
|
|
||
| /// <summary> | ||
| /// Extends <see cref="LoggerConfiguration"/> with methods for configuring asynchronous logging. | ||
| /// </summary> | ||
| public static class LoggerConfigurationAsyncExtensions | ||
| { | ||
| /// <summary> | ||
| /// Extends <see cref="LoggerConfiguration"/> with methods for configuring asynchronous logging. | ||
| /// Configure a sink to be invoked asynchronously, on a background worker thread. | ||
| /// Accepts a reference to a <paramref name="monitor"/> that will be supplied the internal state interface for health monitoring purposes. | ||
| /// </summary> | ||
| public static class LoggerConfigurationAsyncExtensions | ||
| /// <param name="loggerSinkConfiguration">The <see cref="LoggerSinkConfiguration"/> being configured.</param> | ||
| /// <param name="configure">An action that configures the wrapped sink.</param> | ||
| /// <param name="bufferSize">The size of the concurrent queue used to feed the background worker thread. If | ||
| /// the thread is unable to process events quickly enough and the queue is filled, depending on | ||
| /// <paramref name="blockWhenFull"/> the queue will block or subsequent events will be dropped until | ||
| /// room is made in the queue.</param> | ||
| /// <param name="blockWhenFull">Block when the queue is full, instead of dropping events.</param> | ||
| /// <param name="monitor">Monitor to supply buffer information to.</param> | ||
| /// <returns>A <see cref="LoggerConfiguration"/> allowing configuration to continue.</returns> | ||
| public static LoggerConfiguration Async( | ||
| this LoggerSinkConfiguration loggerSinkConfiguration, | ||
| Action<LoggerSinkConfiguration> configure, | ||
| int bufferSize = 10000, | ||
| bool blockWhenFull = false, | ||
| IAsyncLogEventSinkMonitor? monitor = null) | ||
| { | ||
| /// <summary> | ||
| /// Configure a sink to be invoked asynchronously, on a background worker thread. | ||
| /// </summary> | ||
| /// <param name="loggerSinkConfiguration">The <see cref="LoggerSinkConfiguration"/> being configured.</param> | ||
| /// <param name="configure">An action that configures the wrapped sink.</param> | ||
| /// <param name="bufferSize">The size of the concurrent queue used to feed the background worker thread. If | ||
| /// the thread is unable to process events quickly enough and the queue is filled, subsequent events will be | ||
| /// dropped until room is made in the queue.</param> | ||
| /// <returns>A <see cref="LoggerConfiguration"/> allowing configuration to continue.</returns> | ||
| [EditorBrowsable(EditorBrowsableState.Never)] | ||
| public static LoggerConfiguration Async( | ||
| this LoggerSinkConfiguration loggerSinkConfiguration, | ||
| Action<LoggerSinkConfiguration> configure, | ||
| int bufferSize) | ||
| { | ||
| return loggerSinkConfiguration.Async(configure, bufferSize, false); | ||
| } | ||
|
|
||
| /// <summary> | ||
| /// Configure a sink to be invoked asynchronously, on a background worker thread. | ||
| /// </summary> | ||
| /// <param name="loggerSinkConfiguration">The <see cref="LoggerSinkConfiguration"/> being configured.</param> | ||
| /// <param name="configure">An action that configures the wrapped sink.</param> | ||
| /// <param name="bufferSize">The size of the concurrent queue used to feed the background worker thread. If | ||
| /// the thread is unable to process events quickly enough and the queue is filled, depending on | ||
| /// <paramref name="blockWhenFull"/> the queue will block or subsequent events will be dropped until | ||
| /// room is made in the queue.</param> | ||
| /// <param name="blockWhenFull">Block when the queue is full, instead of dropping events.</param> | ||
| /// <returns>A <see cref="LoggerConfiguration"/> allowing configuration to continue.</returns> | ||
| public static LoggerConfiguration Async( | ||
| this LoggerSinkConfiguration loggerSinkConfiguration, | ||
| Action<LoggerSinkConfiguration> configure, | ||
| int bufferSize = 10000, | ||
| bool blockWhenFull = false) | ||
| { | ||
| return loggerSinkConfiguration.Async(configure, null, bufferSize, blockWhenFull); | ||
| } | ||
|
|
||
| /// <summary> | ||
| /// Configure a sink to be invoked asynchronously, on a background worker thread. | ||
| /// Accepts a reference to a <paramref name="monitor"/> that will be supplied the internal state interface for health monitoring purposes. | ||
| /// </summary> | ||
| /// <param name="loggerSinkConfiguration">The <see cref="LoggerSinkConfiguration"/> being configured.</param> | ||
| /// <param name="configure">An action that configures the wrapped sink.</param> | ||
| /// <param name="bufferSize">The size of the concurrent queue used to feed the background worker thread. If | ||
| /// the thread is unable to process events quickly enough and the queue is filled, depending on | ||
| /// <paramref name="blockWhenFull"/> the queue will block or subsequent events will be dropped until | ||
| /// room is made in the queue.</param> | ||
| /// <param name="blockWhenFull">Block when the queue is full, instead of dropping events.</param> | ||
| /// <param name="monitor">Monitor to supply buffer information to.</param> | ||
| /// <returns>A <see cref="LoggerConfiguration"/> allowing configuration to continue.</returns> | ||
| public static LoggerConfiguration Async( | ||
| this LoggerSinkConfiguration loggerSinkConfiguration, | ||
| Action<LoggerSinkConfiguration> configure, | ||
| IAsyncLogEventSinkMonitor monitor, | ||
| int bufferSize = 10000, | ||
| bool blockWhenFull = false) | ||
| { | ||
| return LoggerSinkConfiguration.Wrap( | ||
| loggerSinkConfiguration, | ||
| wrappedSink => new BackgroundWorkerSink(wrappedSink, bufferSize, blockWhenFull, monitor), | ||
| configure, | ||
| LevelAlias.Minimum, | ||
| null); | ||
| } | ||
| var wrapper = LoggerSinkConfiguration.Wrap( | ||
| wrappedSink => new BackgroundWorkerSink(wrappedSink, bufferSize, blockWhenFull, monitor), | ||
| configure); | ||
| return loggerSinkConfiguration.Sink(wrapper); | ||
| } | ||
| } |
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
Oops, something went wrong.