修复 工单第一次连接失败bug

增加工单内log
This commit is contained in:
chfei committed 2026-10-20 10:20:57 +08:00
1 parent 324ca0c6e7
commit 6e5dfa92b8
11 files changed
+566 -560

No files matched your search

@@ -2,6 +2,7 @@
using System.Collections.Generic;
using System.Net.Http;
using System.Text;
using WxOrder.Framework.Helpers;
namespace LaunchDarkly.EventSource
{
@@ -114,6 +115,7 @@ namespace LaunchDarkly.EventSource
/// This is never null; if logging is not configured, it will be <c>LaunchDarkly.Logging.Logs.None</c>.
/// </remarks>
/// <seealso cref="ConfigurationBuilder.Logger(Logger)"/>
public ILogger Logger { get; }
/// <summary>
/// The maximum amount of time to wait before attempting to reconnect.
@@ -174,13 +176,14 @@ namespace LaunchDarkly.EventSource
{
Uri = builder._uri;
var logger = builder._logger;
BackoffResetThreshold = builder._backoffResetThreshold;
HttpClient = builder._httpClient;
HttpMessageHandler = (builder._httpClient != null) ? null : builder._httpMessageHandler;
InitialRetryDelay = builder._initialRetryDelay;
LastEventId = builder._lastEventId;
Logger = logger;
MaxRetryDelay = builder._maxRetryDelay;
Method = builder._method;
PreferDataAsUtf8Bytes = builder._preferDataAsUtf8Bytes;
@@ -3,6 +3,7 @@ using System.Collections.Generic;
using System.Net.Http;
using System.Text;
using System.Threading;
using WxOrder.Framework.Helpers;
namespace LaunchDarkly.EventSource
{
@@ -30,6 +31,7 @@ namespace LaunchDarkly.EventSource
internal TimeSpan _initialRetryDelay = Configuration.DefaultInitialRetryDelay;
internal TimeSpan _backoffResetThreshold = Configuration.DefaultBackoffResetThreshold;
internal string _lastEventId;
internal ILogger _logger;
internal IDictionary<string, string> _requestHeaders = new Dictionary<string, string>();
internal HttpMessageHandler _httpMessageHandler;
internal HttpClient _httpClient;
@@ -230,45 +232,6 @@ namespace LaunchDarkly.EventSource
return this;
}
/// <summary>
/// Sets the logging implementation to be used for all EventSource log output.
/// </summary>
/// <remarks>
/// <para>
/// This uses the <c>ILogAdapter</c> abstraction from the <c>LaunchDarkly.Logging</c> library,
/// which provides several basic implementations such as <c>Logs.ToConsole</c> and an integration
/// with the .NET Core logging framework. For more about this and about adapters to other logging
/// frameworks, see <a href="https://github.com/launchdarkly/dotnet-logging"><c>LaunchDarkly.Logging</c></a>.
/// </para>
/// <para>
/// <c>LaunchDarkly.Logging</c> defines logging levels of Debug, Info, Warn, and Error. If you do not
/// want detailed Debug-level logging, use the <c>Level()</c> modifier to set a minimum level of Info
/// or above, as shown in the code example (unless you are using an adapter to another logging
/// framework that has its own way of doing log filtering).
/// </para>
/// <para>
/// Log messages will use <see cref="Configuration.DefaultLoggerName"/> as the logger name. If you
/// want to specify a different logger name, use <see cref="Logger(Logging.Logger)"/>.
/// </para>
/// <para>
/// If you don't specify <see cref="LogAdapter(ILogAdapter)"/> or <see cref="Logger(Logging.Logger)"/>,
/// EventSource will not do any logging.
/// </para>
/// </remarks>
/// <example>
/// using LaunchDarkly.Logging;
///
/// // Send log output to the console (standard error), suppressing Debug messages
/// var config = new ConfigurationBuilder(uri).
/// LogAdapter(Logs.ToConsole.Level(LogLevel.Info)).
/// Build();
/// </example>
/// <param name="logAdapter">a <c>LaunchDarkly.Logging.ILogAdapter</c></param>
/// <returns>the builder</returns>
public ConfigurationBuilder LogAdapter()
{
return this;
}
/// <summary>
/// Sets a custom logger to be used for all EventSource log output.
@@ -297,8 +260,9 @@ namespace LaunchDarkly.EventSource
/// </example>
/// <param name="logger">a <c>LaunchDarkly.Logging.Logger</c> instance</param>
/// <returns>the builder</returns>
public ConfigurationBuilder Logger()
public ConfigurationBuilder Logger(ILogger logger)
{
_logger = logger;
return this;
}
File diff suppressed because it is too large. Load diff
@@ -7,6 +7,7 @@ using System.Net.Http.Headers;
using System.Reflection;
using System.Threading;
using System.Threading.Tasks;
using WxOrder.Framework.Helpers;
using static LaunchDarkly.EventSource.AsyncHelpers;
@@ -23,6 +24,7 @@ namespace LaunchDarkly.EventSource
private readonly Configuration _configuration;
private readonly HttpClient _httpClient;
private readonly ILogger _logger;
private const string UserAgentProduct = "DotNetClient";
internal static readonly string UserAgentVersion = ((AssemblyInformationalVersionAttribute)typeof(EventSource)
@@ -48,10 +50,11 @@ namespace LaunchDarkly.EventSource
#region Constructors
internal EventSourceService(Configuration configuration, HttpClient httpClient)
internal EventSourceService(Configuration configuration, HttpClient httpClient, ILogger logger)
{
_configuration = configuration ?? throw new ArgumentNullException(nameof(configuration));
_httpClient = httpClient ?? throw new ArgumentNullException(nameof(httpClient));
_logger = logger ?? throw new ArgumentNullException(nameof(logger));
}
#endregion
@@ -85,6 +88,9 @@ namespace LaunchDarkly.EventSource
CancellationToken cancellationToken
)
{
_logger.Debug(string.Format("Making {0} request to EventSource URI {1}",
_configuration.Method ?? HttpMethod.Get,
_configuration.Uri));
var request = CreateHttpRequestMessage(_configuration.Uri, lastEventId);
@@ -94,7 +100,8 @@ namespace LaunchDarkly.EventSource
HttpCompletionOption.ResponseHeadersRead,
cancellationToken).ConfigureAwait(false))
{
ValidateResponse(response);
_logger.Debug(string.Format("Response status: {0}", (int)response.StatusCode));
ValidateResponse(response);
using (var stream = await response.Content.ReadAsStreamAsync().ConfigureAwait(false))
{
@@ -109,10 +116,12 @@ namespace LaunchDarkly.EventSource
if (_configuration.PreferDataAsUtf8Bytes)
{
_logger.Debug("Reading UTF-8 stream without string conversion");
await ProcessResponseFromUtf8StreamAsync(processResponseLineUTF8, stream, cancellationToken);
}
else
{
_logger.Debug("Reading stream with string conversion");
using (var reader = new StreamReader(stream, Encoding.UTF8,
detectEncodingFromByteOrderMarks: true, bufferSize: ReadBufferSize))
{