Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Adjust a few Relay logs #843

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

Merged
jpdillingham merged 1 commit into from
Jan 8, 2023
Merged

Adjust a few Relay logs #843

Show file tree
Hide file tree
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
6 changes: 3 additions & 3 deletions src/slskd/Relay/RelayClient.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -352,16 +352,16 @@ private async Task HandleAuthenticationChallenge(string challengeToken)
{
try
{
Log.Debug("Relay controller sent an authentication challenge");
Log.Information("Relay controller sent an authentication challenge");

var options = OptionsMonitor.CurrentValue;

var agent = options.InstanceName;
var response = ComputeCredential(challengeToken);

Log.Debug("Logging in...");
Log.Information("Logging in...");
await HubConnection.InvokeAsync(nameof(RelayHub.Login), agent, response);
Log.Debug("Login succeeded.");
Log.Information("Login succeeded.");
LoggedInTaskCompletionSource?.TrySetResult();
}
catch (UnauthorizedAccessException)
Expand Down
6 changes: 0 additions & 6 deletions src/slskd/Relay/RelayService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -533,8 +533,6 @@ public async Task<Stream> GetFileStreamAsync(string agentName, string filename,
var key = new WaitKey(nameof(GetFileStreamAsync), agentName, id);
var wait = Waiter.Wait<Stream>(key, timeout, cancellationToken);

Log.Information("Created wait {Key}", key);

await RelayHub.Clients.Client(record.ConnectionId).RequestFileUpload(filename, startOffset, id);
Log.Information("Requested file {Filename} from Agent {Agent} with ID {Id}. Waiting for incoming connection.", filename, agentName, id);

Expand Down Expand Up @@ -563,8 +561,6 @@ public void HandleFileInfoResponse(string agentName, Guid id, (bool Exists, long
{
var key = new WaitKey(nameof(GetFileInfoAsync), agentName, id);

Log.Information("Handling wait {Key}", key);

if (!Waiter.IsWaitingFor(key))
{
var msg = $"A file info response from Agent {agentName} matching Id {id} was not expected";
Expand All @@ -590,8 +586,6 @@ public async Task HandleFileStreamResponse(string agentName, Guid id, Stream res
{
var streamKey = new WaitKey(nameof(GetFileStreamAsync), agentName, id);

Log.Information("Handling wait {Key}", streamKey);

if (!Waiter.IsWaitingFor(streamKey))
{
var msg = $"A file stream response matching Id {id} is not expected";
Expand Down