Skip to content

Commit b9e7765

Browse files
Updates logging from plugins. Closes #887 (#890)
1 parent 198d66c commit b9e7765

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+7977
-7778
lines changed
Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,24 @@
1-
using System.Text.Json;
2-
using Microsoft.DevProxy.Abstractions;
3-
4-
#pragma warning disable IDE0130
5-
namespace Microsoft.Extensions.Logging;
6-
#pragma warning restore IDE0130
7-
8-
public static class ILoggerExtensions
9-
{
10-
public static void LogRequest(this ILogger logger, string[] message, MessageType messageType, LoggingContext? context = null)
11-
{
12-
logger.Log(new RequestLog(message, messageType, context));
13-
}
14-
15-
public static void LogRequest(this ILogger logger, string[] message, MessageType messageType, string method, string url)
16-
{
17-
logger.Log(new RequestLog(message, messageType, method, url));
18-
}
19-
20-
public static void Log(this ILogger logger, RequestLog message)
21-
{
22-
logger.Log(LogLevel.Information, 0, message, exception: null, (m, _) => JsonSerializer.Serialize(m));
23-
}
1+
using System.Text.Json;
2+
using Microsoft.DevProxy.Abstractions;
3+
4+
#pragma warning disable IDE0130
5+
namespace Microsoft.Extensions.Logging;
6+
#pragma warning restore IDE0130
7+
8+
public static class ILoggerExtensions
9+
{
10+
public static void LogRequest(this ILogger logger, string message, MessageType messageType, LoggingContext? context = null)
11+
{
12+
logger.Log(new RequestLog(message, messageType, context));
13+
}
14+
15+
public static void LogRequest(this ILogger logger, string message, MessageType messageType, string method, string url)
16+
{
17+
logger.Log(new RequestLog(message, messageType, method, url));
18+
}
19+
20+
public static void Log(this ILogger logger, RequestLog message)
21+
{
22+
logger.Log(LogLevel.Information, 0, message, exception: null, (m, _) => JsonSerializer.Serialize(m));
23+
}
2424
}
Lines changed: 25 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,26 @@
1-
// Copyright (c) Microsoft Corporation.
2-
// Licensed under the MIT License.
3-
using Titanium.Web.Proxy.EventArguments;
4-
using Microsoft.Extensions.Logging;
5-
6-
namespace Microsoft.DevProxy.Abstractions;
7-
8-
public enum MessageType
9-
{
10-
Normal,
11-
InterceptedRequest,
12-
PassedThrough,
13-
Warning,
14-
Tip,
15-
Failed,
16-
Chaos,
17-
Mocked,
18-
InterceptedResponse,
19-
FinishedProcessingRequest
20-
}
21-
22-
public class LoggingContext(SessionEventArgs session)
23-
{
24-
public SessionEventArgs Session { get; } = session;
25-
}
26-
27-
public interface IProxyLogger : ICloneable, ILogger
28-
{
29-
public LogLevel LogLevel { get; set; }
30-
public void LogRequest(string[] message, MessageType messageType, LoggingContext? context = null);
31-
public void LogRequest(string[] message, MessageType messageType, string method, string url);
1+
// Copyright (c) Microsoft Corporation.
2+
// Licensed under the MIT License.
3+
4+
using Titanium.Web.Proxy.EventArguments;
5+
6+
namespace Microsoft.DevProxy.Abstractions;
7+
8+
public enum MessageType
9+
{
10+
Normal,
11+
InterceptedRequest,
12+
PassedThrough,
13+
Warning,
14+
Tip,
15+
Failed,
16+
Chaos,
17+
Mocked,
18+
InterceptedResponse,
19+
FinishedProcessingRequest,
20+
Skipped
21+
}
22+
23+
public class LoggingContext(SessionEventArgs session)
24+
{
25+
public SessionEventArgs Session { get; } = session;
3226
}

0 commit comments

Comments
 (0)