Skip to content

Use structured logging templates instead of string.Format(). #20

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ScrubN wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Use structured logging templates instead of string.Format(). #20

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
27 changes: 15 additions & 12 deletions CurlThin/HyperPipe/HyperPipe.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,9 +47,9 @@ public HyperPipe(int poolSize,
_socketCallback = HandleSocket;
_timerCallback = StartTimeout;

Logger.LogDebug($"Set {CURLMoption.SOCKETFUNCTION}.");
Logger.LogDebug("Set {Socketfunction}.", CURLMoption.SOCKETFUNCTION);
CurlNative.Multi.SetOpt(_multiHandle, CURLMoption.SOCKETFUNCTION, _socketCallback);
Logger.LogDebug($"Set {CURLMoption.TIMERFUNCTION}.");
Logger.LogDebug("Set {Timerfunction}.", CURLMoption.TIMERFUNCTION);
CurlNative.Multi.SetOpt(_multiHandle, CURLMoption.TIMERFUNCTION, _timerCallback);
}

Expand Down Expand Up @@ -85,8 +85,8 @@ public void RunLoopWait()
/// <returns></returns>
private int HandleSocket(IntPtr easy, IntPtr sockfd, CURLpoll what, IntPtr userp, IntPtr socketp)
{
Logger.LogTrace(
$"Called {nameof(CURLMoption.SOCKETFUNCTION)}. We need to poll for {what} on socket {sockfd}.");
Logger.LogTrace("Called {SocketfunctionName}. We need to poll for {What} on socket {Sockfd}.",
nameof(CURLMoption.SOCKETFUNCTION), what, sockfd);

switch (what)
{
Expand All @@ -104,7 +104,8 @@ private int HandleSocket(IntPtr easy, IntPtr sockfd, CURLpoll what, IntPtr userp
events |= PollMask.Readable;
}

Logger.LogTrace($"Polling socket {sockfd} using libuv with mask {events}.");
Logger.LogTrace("Polling socket {Sockfd} using libuv with mask {Events}.",
sockfd, events);

_socketMap.GetOrCreatePoll(sockfd, _loop).Start(events, (poll, status) =>
{
Expand All @@ -119,13 +120,13 @@ private int HandleSocket(IntPtr easy, IntPtr sockfd, CURLpoll what, IntPtr userp
flags |= CURLcselect.OUT;
}

Logger.LogTrace($"Finished polling socket {sockfd}.");
Logger.LogTrace("Finished polling socket {Sockfd}.", sockfd);
CurlNative.Multi.SocketAction(_multiHandle, sockfd, flags, out int _);
CheckMultiInfo();
});
break;
case CURLpoll.REMOVE:
Logger.LogTrace($"Removing poll of socket {sockfd}.");
Logger.LogTrace("Removing poll of socket {Sockfd}.", sockfd);
_socketMap.RemovePoll(sockfd);
break;
default:
Expand All @@ -146,21 +147,23 @@ private int StartTimeout(IntPtr multiHandle, int timeoutMs, IntPtr userp)
{
if (timeoutMs < 0)
{
Logger.LogTrace($"Called {nameof(CURLMoption.TIMERFUNCTION)} with timeout set to {timeoutMs}. "
+ "Deleting our timer.");
Logger.LogTrace("Called {TimerfunctionName} with timeout set to {TimeoutMs}. " +
"Deleting our timer.", nameof(CURLMoption.TIMERFUNCTION), timeoutMs);
_timeout.Stop();
}
else if (timeoutMs == 0)
{
Logger.LogTrace($"Called {nameof(CURLMoption.TIMERFUNCTION)} with timeout set to {timeoutMs}. "
+ "We should call curl_multi_socket_action or curl_multi_perform (once) as soon as possible.");
Logger.LogTrace("Called {TimerfunctionName} with timeout set to {TimeoutMs}. " +
"We should call curl_multi_socket_action or curl_multi_perform (once) as soon as possible.",
nameof(CURLMoption.TIMERFUNCTION), timeoutMs);

CurlNative.Multi.SocketAction(_multiHandle, SafeSocketHandle.Invalid, 0, out int _);
CheckMultiInfo();
}
else
{
Logger.LogTrace($"Called {nameof(CURLMoption.TIMERFUNCTION)} with timeout set to {timeoutMs} ms.");
Logger.LogTrace("Called {TimerfunctionName} with timeout set to {TimeoutMs} ms.",
nameof(CURLMoption.TIMERFUNCTION), timeoutMs);

_timeout.Start(t =>
{
Expand Down