Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 3 additions & 15 deletions dotnet/src/webdriver/Internal/Logging/ConsoleLogHandler.cs
Original file line number Diff line number Diff line change
Expand Up @@ -23,21 +23,9 @@

namespace OpenQA.Selenium.Internal.Logging
{
[Obsolete("Use TextWriterHandler instead, will be removed in v4.32")]
/// <summary>
/// Represents a log handler that writes log events to the console.
/// Represents a log handler that writes log events to the given text writer.
/// </summary>
public class ConsoleLogHandler : ILogHandler
{
// performance trick to avoid expensive Enum.ToString() with fixed length
private static readonly string[] _levels = { "TRACE", "DEBUG", " INFO", " WARN", "ERROR" };

/// <summary>
/// Handles a log event by writing it to the console.
/// </summary>
/// <param name="logEvent">The log event to handle.</param>
public void Handle(LogEvent logEvent)
{
Console.Error.WriteLine($"{logEvent.Timestamp:HH:mm:ss.fff} {_levels[(int)logEvent.Level]} {logEvent.IssuedBy.Name}: {logEvent.Message}");
}
}
public class ConsoleLogHandler() : TextWriterHandler(Console.Error);
}
7 changes: 4 additions & 3 deletions dotnet/src/webdriver/Internal/Logging/LogContextManager.cs
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
// under the License.
// </copyright>

using System;
using System.Diagnostics.CodeAnalysis;
using System.Threading;

Expand All @@ -26,13 +27,13 @@ namespace OpenQA.Selenium.Internal.Logging
{
internal class LogContextManager
{
private readonly AsyncLocal<ILogContext?> _currentAmbientLogContext = new AsyncLocal<ILogContext?>();
private readonly AsyncLocal<ILogContext?> _currentAmbientLogContext = new();

public LogContextManager()
{
var defaulConsoleLogHandler = new ConsoleLogHandler();
var defaulLogHandler = new TextWriterHandler(Console.Error);

GlobalContext = new LogContext(LogEventLevel.Info, null, null, new[] { defaulConsoleLogHandler });
GlobalContext = new LogContext(LogEventLevel.Info, null, null, [defaulLogHandler]);
}

public ILogContext GlobalContext { get; }
Expand Down
43 changes: 43 additions & 0 deletions dotnet/src/webdriver/Internal/Logging/TextWriterHandler.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
// <copyright file="TextWriterHandler.cs" company="Selenium Committers">
// Licensed to the Software Freedom Conservancy (SFC) under one
// or more contributor license agreements. See the NOTICE file
// distributed with this work for additional information
// regarding copyright ownership. The SFC licenses this file
// to you 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.
// </copyright>

using System.IO;

#nullable enable

namespace OpenQA.Selenium.Internal.Logging
{
/// <summary>
/// Represents a log handler that writes log events to the given text writer.
/// </summary>
public class TextWriterHandler(TextWriter writer) : ILogHandler
{
// performance trick to avoid expensive Enum.ToString() with fixed length
private static readonly string[] _levels = { "TRACE", "DEBUG", " INFO", " WARN", "ERROR" };

/// <summary>
/// Handles a log event by writing it to the text writer.
/// </summary>
/// <param name="logEvent">The log event to handle.</param>
public void Handle(LogEvent logEvent)
{
writer.WriteLine($"{logEvent.Timestamp:HH:mm:ss.fff} {_levels[(int)logEvent.Level]} {logEvent.IssuedBy.Name}: {logEvent.Message}");
}
}
}
2 changes: 1 addition & 1 deletion dotnet/test/common/Internal/Logging/LogTest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ public class LogTest
private void ResetGlobalLog()
{
Log.SetLevel(LogEventLevel.Info);
Log.Handlers.Clear().Handlers.Add(new ConsoleLogHandler());
Log.Handlers.Clear().Handlers.Add(new TextWriterHandler(Console.Error));
}

[SetUp]
Expand Down
Loading