Skip to content

Commit 57ebe12

Browse files
NoirHareNoirHare
committed
[Milky] Simplify log writing
1 parent c7db17c commit 57ebe12

8 files changed

Lines changed: 53 additions & 53 deletions

File tree

‎Lagrange.Milky/Api/MilkyHttpApiService.cs‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -255,44 +255,44 @@ private async Task SendWithLoggerAsync<TBody>(HttpListenerContext context, TBody
255255

256256
public static partial class MilkyApiServiceLoggerExtension
257257
{
258-
[LoggerMessage(EventId = 0, Level = LogLevel.Information, Message = "Api http server is running on {prefix}")]
258+
[LoggerMessage(LogLevel.Information, "Api http server is running on {prefix}")]
259259
public static partial void LogServerRunning(this ILogger<MilkyHttpApiService> logger, string prefix);
260260

261-
[LoggerMessage(EventId = 1, Level = LogLevel.Debug, Message = "{identifier} {remote} -->> {method} {path}")]
261+
[LoggerMessage(LogLevel.Debug, "{identifier} {remote} -->> {method} {path}")]
262262
public static partial void LogReceive(this ILogger<MilkyHttpApiService> logger, Guid identifier, IPEndPoint remote, string method, string? path);
263263

264-
[LoggerMessage(EventId = 2, Level = LogLevel.Debug, Message = "{identifier} {remote} -->> {body}")]
264+
[LoggerMessage(LogLevel.Debug, "{identifier} {remote} -->> {body}")]
265265
private static partial void LogReceiveBody(this ILogger<MilkyHttpApiService> logger, Guid identifier, IPEndPoint remote, string body);
266266
public static void LogReceiveBody(this ILogger<MilkyHttpApiService> logger, Guid identifier, IPEndPoint remote, Span<byte> body)
267267
{
268268
if (logger.IsEnabled(LogLevel.Debug)) logger.LogReceiveBody(identifier, remote, Encoding.UTF8.GetString(body));
269269
}
270270

271-
[LoggerMessage(EventId = 3, Level = LogLevel.Debug, Message = "{identifier} {remote} <<-- {status}")]
271+
[LoggerMessage(LogLevel.Debug, "{identifier} {remote} <<-- {status}")]
272272
public static partial void LogSend(this ILogger<MilkyHttpApiService> logger, Guid identifier, IPEndPoint remote, HttpStatusCode status);
273273

274-
[LoggerMessage(EventId = 4, Level = LogLevel.Debug, Message = "{identifier} {remote} <<-- {body}", SkipEnabledCheck = true)]
274+
[LoggerMessage(LogLevel.Debug, "{identifier} {remote} <<-- {body}", SkipEnabledCheck = true)]
275275
private static partial void LogSend(this ILogger<MilkyHttpApiService> logger, Guid identifier, IPEndPoint remote, string body);
276276
public static void LogSend(this ILogger<MilkyHttpApiService> logger, Guid identifier, IPEndPoint remote, Span<byte> body)
277277
{
278278
if (logger.IsEnabled(LogLevel.Debug)) logger.LogSend(identifier, remote, Encoding.UTF8.GetString(body));
279279
}
280280

281-
[LoggerMessage(EventId = 994, Level = LogLevel.Error, Message = "{identifier} {remote} <!!> Send failed")]
281+
[LoggerMessage(LogLevel.Error, "{identifier} {remote} <!!> Send failed")]
282282
public static partial void LogSendException(this ILogger<MilkyHttpApiService> logger, Guid identifier, IPEndPoint remote, System.Exception e);
283283

284-
[LoggerMessage(EventId = 995, Level = LogLevel.Error, Message = "{identifier} {remote} <!!> Handle http context failed")]
284+
[LoggerMessage(LogLevel.Error, "{identifier} {remote} <!!> Handle http context failed")]
285285
public static partial void LogHandleHttpContextException(this ILogger<MilkyHttpApiService> logger, Guid identifier, IPEndPoint remote, System.Exception e);
286286

287-
[LoggerMessage(EventId = 996, Level = LogLevel.Error, Message = "{identifier} {remote} <!!> Handle api failed")]
287+
[LoggerMessage(LogLevel.Error, "{identifier} {remote} <!!> Handle api failed")]
288288
public static partial void LogHandleApiException(this ILogger<MilkyHttpApiService> logger, Guid identifier, IPEndPoint remote, System.Exception e);
289289

290-
[LoggerMessage(EventId = 997, Level = LogLevel.Error, Message = "{identifier} {remote} <!!> Deserialize parameter failed")]
290+
[LoggerMessage(LogLevel.Error, "{identifier} {remote} <!!> Deserialize parameter failed")]
291291
public static partial void LogDeserializeParameterException(this ILogger<MilkyHttpApiService> logger, Guid identifier, IPEndPoint remote, System.Exception e);
292292

293-
[LoggerMessage(EventId = 998, Level = LogLevel.Error, Message = "{identifier} {remote} <!!> Validate access token failed")]
293+
[LoggerMessage(LogLevel.Error, "{identifier} {remote} <!!> Validate access token failed")]
294294
public static partial void LogValidateAccessTokenFailed(this ILogger<MilkyHttpApiService> logger, Guid identifier, IPEndPoint remote);
295295

296-
[LoggerMessage(EventId = 999, Level = LogLevel.Error, Message = "Get http context failed")]
296+
[LoggerMessage(LogLevel.Error, "Get http context failed")]
297297
public static partial void LogGetHttpContextException(this ILogger<MilkyHttpApiService> logger, System.Exception e);
298298
}

‎Lagrange.Milky/Core/CoreLoggerService.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,13 +73,13 @@ public void Dispose()
7373

7474
private static partial class LoggerUtility
7575
{
76-
[LoggerMessage(EventId = 0, Message = "{message}")]
76+
[LoggerMessage("{message}")]
7777
public static partial void LogBotMessage(ILogger logger, MSLogLevel level, string message, Exception? exception);
7878
}
7979
}
8080

8181
public static partial class CoreLoggerServiceLoggerExtension
8282
{
83-
[LoggerMessage(EventId = 0, Level = MSLogLevel.Debug, Message = "Core minimum log level reloaded to {level}")]
83+
[LoggerMessage(MSLogLevel.Debug, "Core minimum log level reloaded to {level}")]
8484
public static partial void LogCoreMinimumLogLevelReloaded(this ILogger<CoreLoggerService> logger, CoreLogLevel level);
8585
}

‎Lagrange.Milky/Core/CoreLoginService.cs‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -120,24 +120,24 @@ public async Task StopAsync(CancellationToken cancellationToken)
120120

121121
public static partial class CoreLoginServiceLoggerExtension
122122
{
123-
[LoggerMessage(EventId = 0, Level = MSLogLevel.Information, Message = "\n{qrcode}")]
123+
[LoggerMessage(MSLogLevel.Information, "\n{qrcode}")]
124124
public static partial void LogQrCode(this ILogger<CoreLoginService> logger, string qrcode);
125125

126-
[LoggerMessage(EventId = 1, Level = MSLogLevel.Information, Message = "Fetch QrCode Success, Expiration: 120 seconds, Url: {url}")]
126+
[LoggerMessage(MSLogLevel.Information, "Fetch QrCode Success, Expiration: 120 seconds, Url: {url}")]
127127
public static partial void LogFetchQrCodeSuccess(this ILogger<CoreLoginService> logger, string url);
128128

129-
[LoggerMessage(EventId = 2, Message = "QrCode State: {state}")]
129+
[LoggerMessage("QrCode State: {state}")]
130130
public static partial void LogQrCodeState(this ILogger<CoreLoginService> logger, MSLogLevel level, TransEmpState state);
131131

132-
[LoggerMessage(EventId = 3, Level = MSLogLevel.Information, Message = "NewDevice verify required, please scan the QrCode with the device that has already logged in with uin {uin}")]
132+
[LoggerMessage(MSLogLevel.Information, "NewDevice verify required, please scan the QrCode with the device that has already logged in with uin {uin}")]
133133
public static partial void LogNewDeviceVerify(this ILogger<CoreLoginService> logger, long uin);
134134

135-
[LoggerMessage(EventId = 4, Level = MSLogLevel.Information, Message = "{uin} successfully logged in via {protocol} {version}")]
135+
[LoggerMessage(MSLogLevel.Information, "{uin} successfully logged in via {protocol} {version}")]
136136
public static partial void LogLoginSuccessful(this ILogger<CoreLoginService> logger, long uin, Protocols protocol, string version);
137137

138-
[LoggerMessage(EventId = 998, Level = MSLogLevel.Critical, Message = "Login failed")]
138+
[LoggerMessage(MSLogLevel.Critical, "Login failed")]
139139
public static partial void LogLoginFailed(this ILogger<CoreLoginService> logger);
140140

141-
[LoggerMessage(EventId = 999, Level = MSLogLevel.Critical, Message = "SMS code is empty")]
141+
[LoggerMessage(MSLogLevel.Critical, "SMS code is empty")]
142142
public static partial void LogSmsCodeEmpty(this ILogger<CoreLoginService> logger);
143143
}

‎Lagrange.Milky/Event/EventService.cs‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -285,36 +285,36 @@ public void Unregister(Action<Memory<byte>> handler)
285285

286286
public static partial class EventServiceLoggerExtension
287287
{
288-
[LoggerMessage(EventId = 0, Level = LogLevel.Debug, Message = "BotOfflineEvent {{ {reason} {tag} {message} }}")]
288+
[LoggerMessage(LogLevel.Debug, "BotOfflineEvent {{ {reason} {tag} {message} }}")]
289289
public static partial void LogOffline(this ILogger<EventService> logger, Reasons reason, string? tag, string? message);
290290

291-
[LoggerMessage(EventId = 1, Level = LogLevel.Debug, Message = "BotMessageEvent {{ {type} {group} {sender} {entities} }}")]
291+
[LoggerMessage(LogLevel.Debug, "BotMessageEvent {{ {type} {group} {sender} {entities} }}")]
292292
public static partial void LogGroupMessage(this ILogger<EventService> logger, MessageType type, long group, long sender, string entities);
293293

294-
[LoggerMessage(EventId = 2, Level = LogLevel.Debug, Message = "BotMessageEvent {{ {type} {sender} {entities} }}")]
294+
[LoggerMessage(LogLevel.Debug, "BotMessageEvent {{ {type} {sender} {entities} }}")]
295295
public static partial void LogPrivateMessage(this ILogger<EventService> logger, MessageType type, long sender, string entities);
296296

297-
[LoggerMessage(EventId = 3, Level = LogLevel.Debug, Message = "BotGroupNudgeEvent {{ group: {group}, sender: {sender} target: {target} }}")]
297+
[LoggerMessage(LogLevel.Debug, "BotGroupNudgeEvent {{ group: {group}, sender: {sender} target: {target} }}")]
298298
public static partial void LogGroupNudgeEvent(this ILogger<EventService> logger, long group, long sender, long target);
299299

300-
[LoggerMessage(EventId = 4, Level = LogLevel.Debug, Message = "BotGroupMemberDecreaseEvent {{ group: {group}, user: {user}, operator: {operator} }}")]
300+
[LoggerMessage(LogLevel.Debug, "BotGroupMemberDecreaseEvent {{ group: {group}, user: {user}, operator: {operator} }}")]
301301
public static partial void LogGroupMemberDecreaseEvent(this ILogger<EventService> logger, long group, long user, long? @operator);
302302

303-
[LoggerMessage(EventId = 5, Level = LogLevel.Debug, Message = "BotFriendRequestEvent {{ request: {request}, user: {user}, message: {message}, source: {source} }}")]
303+
[LoggerMessage(LogLevel.Debug, "BotFriendRequestEvent {{ request: {request}, user: {user}, message: {message}, source: {source} }}")]
304304
public static partial void LogFriendRequestEvent(this ILogger<EventService> logger, string request, long user, string? message, string? source);
305305

306-
[LoggerMessage(EventId = 6, Level = LogLevel.Debug, Message = "BotGroupInviteEvent {{ request: {request}, user: {user}, group: {group} }}")]
306+
[LoggerMessage(LogLevel.Debug, "BotGroupInviteEvent {{ request: {request}, user: {user}, group: {group} }}")]
307307
public static partial void LogGroupInvitationEvent(this ILogger<EventService> logger, long request, long user, long group);
308308

309-
[LoggerMessage(EventId = 7, Level = LogLevel.Debug, Message = "BotGroupMemberIncreaseEvent {{ group: {group}, user: {user}, operator: {operator}, invitor: {invitor} }}")]
309+
[LoggerMessage(LogLevel.Debug, "BotGroupMemberIncreaseEvent {{ group: {group}, user: {user}, operator: {operator}, invitor: {invitor} }}")]
310310
public static partial void LogGroupMemberIncreaseEvent(this ILogger<EventService> logger, long group, long user, long? @operator, long? invitor);
311311

312-
[LoggerMessage(EventId = 8, Level = LogLevel.Debug, Message = "GroupRecallEvent {{ group: {group}, sequence: {sequence}, author: {author}, operator: {operator}, tip: {tip} }}")]
312+
[LoggerMessage(LogLevel.Debug, "GroupRecallEvent {{ group: {group}, sequence: {sequence}, author: {author}, operator: {operator}, tip: {tip} }}")]
313313
public static partial void LogGroupRecallEvent(this ILogger<EventService> logger, long group, ulong sequence, long author, long @operator, string tip);
314314

315-
[LoggerMessage(EventId = 9, Level = LogLevel.Debug, Message = "FriendRecallEvent {{ peer: {peer} author: {author}, sequence: {sequence}, tip: {tip} }}")]
315+
[LoggerMessage(LogLevel.Debug, "FriendRecallEvent {{ peer: {peer} author: {author}, sequence: {sequence}, tip: {tip} }}")]
316316
public static partial void LogFriendRecallEvent(this ILogger<EventService> logger, long peer, long author, ulong sequence, string tip);
317317

318-
[LoggerMessage(EventId = 999, Level = LogLevel.Error, Message = "Handle {event} exception")]
318+
[LoggerMessage(LogLevel.Error, "Handle {event} exception")]
319319
public static partial void LogHandleEventException(this ILogger<EventService> logger, string @event, Exception e);
320320
}

‎Lagrange.Milky/Event/MilkyWebHookEventService.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,17 +63,17 @@ public Task StopAsync(CancellationToken cancellationToken)
6363

6464
public static partial class MilkyWebHookEventServiceLoggerExtension
6565
{
66-
[LoggerMessage(EventId = 0, Level = LogLevel.Information, Message = "WebHook service running; delivering to {url}")]
66+
[LoggerMessage(LogLevel.Information, "WebHook service running; delivering to {url}")]
6767
public static partial void LogServiceRunning(this ILogger<MilkyWebHookEventService> logger, string url);
6868

69-
[LoggerMessage(EventId = 1, Level = LogLevel.Debug, Message = "{url} <<-- {body}", SkipEnabledCheck = true)]
69+
[LoggerMessage(LogLevel.Debug, "{url} <<-- {body}", SkipEnabledCheck = true)]
7070
private static partial void LogSend(this ILogger<MilkyWebHookEventService> logger, string url, string body);
7171
public static void LogSend(this ILogger<MilkyWebHookEventService> logger, string url, Span<byte> body)
7272
{
7373
if (logger.IsEnabled(LogLevel.Information)) logger.LogSend(url, Encoding.UTF8.GetString(body));
7474
}
7575

7676

77-
[LoggerMessage(EventId = 999, Level = LogLevel.Error, Message = "{url} <!!> Send exception")]
77+
[LoggerMessage(LogLevel.Error, "{url} <!!> Send exception")]
7878
public static partial void LogSendException(this ILogger<MilkyWebHookEventService> logger, string url, Exception e);
7979
}

‎Lagrange.Milky/Event/MilkyWebSocketEventService.cs‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -301,44 +301,44 @@ private class ConnectionContext(HttpListenerContext httpContext, WebSocketContex
301301

302302
public static partial class MilkyWebSocketEventServiceLoggerExtension
303303
{
304-
[LoggerMessage(EventId = 0, Level = LogLevel.Information, Message = "Event websocket server is running on {prefix}")]
304+
[LoggerMessage(LogLevel.Information, "Event websocket server is running on {prefix}")]
305305
public static partial void LogServerRunning(this ILogger<MilkyWebSocketEventService> logger, string prefix);
306306

307-
[LoggerMessage(EventId = 1, Level = LogLevel.Debug, Message = "{identifier} {remote} -->> {method} {path}")]
307+
[LoggerMessage(LogLevel.Debug, "{identifier} {remote} -->> {method} {path}")]
308308
public static partial void LogHttpContext(this ILogger<MilkyWebSocketEventService> logger, Guid identifier, IPEndPoint remote, string method, string? path);
309309

310-
[LoggerMessage(EventId = 2, Level = LogLevel.Debug, Message = "{identifier} {remote} <<-- {status}")]
310+
[LoggerMessage(LogLevel.Debug, "{identifier} {remote} <<-- {status}")]
311311
public static partial void LogSend(this ILogger<MilkyWebSocketEventService> logger, Guid identifier, IPEndPoint remote, HttpStatusCode status);
312312

313-
[LoggerMessage(EventId = 3, Level = LogLevel.Debug, Message = "WebSockets <<-- {payload}")]
313+
[LoggerMessage(LogLevel.Debug, "WebSockets <<-- {payload}")]
314314
private static partial void LogSend(this ILogger<MilkyWebSocketEventService> logger, string payload);
315315
public static void LogSend(this ILogger<MilkyWebSocketEventService> logger, Span<byte> payload)
316316
{
317317
if (logger.IsEnabled(LogLevel.Debug)) logger.LogSend(Encoding.UTF8.GetString(payload));
318318
}
319319

320-
[LoggerMessage(EventId = 4, Level = LogLevel.Debug, Message = "{identifier} {remote} <//> WebSocket closed")]
320+
[LoggerMessage(LogLevel.Debug, "{identifier} {remote} <//> WebSocket closed")]
321321
public static partial void LogWebSocketClosed(this ILogger<MilkyWebSocketEventService> logger, Guid identifier, IPEndPoint remote);
322322

323323

324-
[LoggerMessage(EventId = 995, Level = LogLevel.Error, Message = "{identifier} {remote} <!!> WebSocket close failed")]
324+
[LoggerMessage(LogLevel.Error, "{identifier} {remote} <!!> WebSocket close failed")]
325325
public static partial void LogWebSocketCloseException(this ILogger<MilkyWebSocketEventService> logger, Guid identifier, IPEndPoint remote, Exception e);
326326

327-
[LoggerMessage(EventId = 995, Level = LogLevel.Error, Message = "{identifier} {remote} <!!> Wait websocket close failed")]
327+
[LoggerMessage(LogLevel.Error, "{identifier} {remote} <!!> Wait websocket close failed")]
328328
public static partial void LogWaitWebSocketCloseException(this ILogger<MilkyWebSocketEventService> logger, Guid identifier, IPEndPoint remote, Exception e);
329329

330-
[LoggerMessage(EventId = 995, Level = LogLevel.Error, Message = "{identifier} {remote} <!!> Send failed")]
330+
[LoggerMessage(LogLevel.Error, "{identifier} {remote} <!!> Send failed")]
331331
public static partial void LogSendException(this ILogger<MilkyWebSocketEventService> logger, Guid identifier, IPEndPoint remote, Exception e);
332332

333-
[LoggerMessage(EventId = 996, Level = LogLevel.Error, Message = "{identifier} {remote} <!!> Handle http context failed")]
333+
[LoggerMessage(LogLevel.Error, "{identifier} {remote} <!!> Handle http context failed")]
334334
public static partial void LogHandleHttpContextException(this ILogger<MilkyWebSocketEventService> logger, Guid identifier, IPEndPoint remote, Exception e);
335335

336-
[LoggerMessage(EventId = 997, Level = LogLevel.Error, Message = "{identifier} {remote} <!!> Upgrade websocket failed")]
336+
[LoggerMessage(LogLevel.Error, "{identifier} {remote} <!!> Upgrade websocket failed")]
337337
public static partial void LogUpgradeWebSocketException(this ILogger<MilkyWebSocketEventService> logger, Guid identifier, IPEndPoint remote, Exception e);
338338

339-
[LoggerMessage(EventId = 998, Level = LogLevel.Error, Message = "{identifier} {remote} <!!> Validate access token failed")]
339+
[LoggerMessage(LogLevel.Error, "{identifier} {remote} <!!> Validate access token failed")]
340340
public static partial void LogValidateAccessTokenFailed(this ILogger<MilkyWebSocketEventService> logger, Guid identifier, IPEndPoint remote);
341341

342-
[LoggerMessage(EventId = 999, Level = LogLevel.Error, Message = "Get http context failed")]
342+
[LoggerMessage(LogLevel.Error, "Get http context failed")]
343343
public static partial void LogGetHttpContextException(this ILogger<MilkyWebSocketEventService> logger, Exception e);
344344
}

‎Lagrange.Milky/Utility/CaptchaResolver/OnlineCaptchaResolver.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,18 +52,18 @@ public class OnlineCaptchaResolver(ILogger<OnlineCaptchaResolver> logger, IOptio
5252

5353
public static partial class OnlineCaptchaResolverLoggerExtension
5454
{
55-
[LoggerMessage(EventId = 0, Level = LogLevel.Information, Message = "\n{qrcode}")]
55+
[LoggerMessage(LogLevel.Information, "\n{qrcode}")]
5656
public static partial void LogCaptchaQrCode(this ILogger<OnlineCaptchaResolver> logger, string qrcode);
5757

58-
[LoggerMessage(EventId = 1, Level = LogLevel.Information, Message = "Please scan the QR code or access the {url} to solve the captcha")]
58+
[LoggerMessage(LogLevel.Information, "Please scan the QR code or access the {url} to solve the captcha")]
5959
public static partial void LogCaptchaTip(this ILogger<OnlineCaptchaResolver> logger, string url);
6060

61-
[LoggerMessage(EventId = 2, Level = LogLevel.Debug, Message = "Waiting for captcha response...")]
61+
[LoggerMessage(LogLevel.Debug, "Waiting for captcha response...")]
6262
public static partial void LogCaptchaWaiting(this ILogger<OnlineCaptchaResolver> logger);
6363

6464
[LoggerMessage(Level = LogLevel.Information, Message = "Captcha solved, ticket: {ticket}, randstr: {randstr}")]
6565
public static partial void CaptchaSolved(this ILogger<OnlineCaptchaResolver> logger, string ticket, string randstr);
6666

67-
[LoggerMessage(EventId = 999, Level = LogLevel.Error, Message = "Unexpected http status code({status})")]
67+
[LoggerMessage(LogLevel.Error, "Unexpected http status code({status})")]
6868
public static partial void LogCaptchaError(this ILogger<OnlineCaptchaResolver> logger, HttpStatusCode status);
6969
}

0 commit comments

Comments
 (0)