t0w0bi/ClubPenguinClient
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

minor bugfixing and log severity adjustment

Browse Source
This commit is contained in:
Stanley Dimant
2022-07-28 14:14:00 +02:00
parent 57c0a4b9b0
commit 34ed21472a
6 changed files with 54 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
MareSynchronos/WebAPI/ApIController.Functions.Files.cs
View File

@@ -76,7 +76,7 @@ namespace MareSynchronos.WebAPI
if (ct.IsCancellationRequested)
{
File.Delete(tempFile);
Logger.Verbose("Detected cancellation, removing " + currentDownloadId);
Logger.Debug("Detected cancellation, removing " + currentDownloadId);
CurrentDownloads.Remove(currentDownloadId);
break;
}
@@ -113,7 +113,7 @@ namespace MareSynchronos.WebAPI
await Task.Delay(250, ct);
}
Logger.Verbose("Download complete, removing " + currentDownloadId);
Logger.Debug("Download complete, removing " + currentDownloadId);
CurrentDownloads.Remove(currentDownloadId);
}
@@ -162,10 +162,10 @@ namespace MareSynchronos.WebAPI
}
var totalSize = CurrentUploads.Sum(c => c.Total);
Logger.Verbose("Compressing and uploading files");
Logger.Debug("Compressing and uploading files");
foreach (var file in CurrentUploads.Where(f => f.CanBeTransferred && !f.IsTransferred).ToList())
{
Logger.Verbose("Compressing and uploading " + file);
Logger.Debug("Compressing and uploading " + file);
var data = await GetCompressedFileData(file.Hash, uploadToken);
CurrentUploads.Single(e => e.Hash == data.Item1).Total = data.Item2.Length;
await UploadFile(data.Item2, file.Hash, uploadToken);
@@ -181,21 +181,21 @@ namespace MareSynchronos.WebAPI
Logger.Debug($"Compressed {totalSize} to {compressedSize} ({(compressedSize / (double)totalSize):P2})");
}
Logger.Verbose("Upload tasks complete, waiting for server to confirm");
Logger.Debug("Upload tasks complete, waiting for server to confirm");
var anyUploadsOpen = await _mareHub!.InvokeAsync<bool>(Api.InvokeFileIsUploadFinished, uploadToken);
Logger.Verbose("Uploads open: " + anyUploadsOpen);
Logger.Debug("Uploads open: " + anyUploadsOpen);
while (anyUploadsOpen && !uploadToken.IsCancellationRequested)
{
anyUploadsOpen = await _mareHub!.InvokeAsync<bool>(Api.InvokeFileIsUploadFinished, uploadToken);
await Task.Delay(TimeSpan.FromSeconds(0.5), uploadToken);
Logger.Verbose("Waiting for uploads to finish");
Logger.Debug("Waiting for uploads to finish");
}
CurrentUploads.Clear();
if (!uploadToken.IsCancellationRequested)
{
Logger.Verbose("=== Pushing character data ===");
Logger.Info("Pushing character data for " + character.GetHashCode());
await _mareHub!.InvokeAsync(Api.InvokeUserPushCharacterDataToVisibleClients, character, visibleCharacterIds, uploadToken);
}
else

12
MareSynchronos/WebAPI/ApiController.Connectivity.cs
View File

@@ -145,7 +145,7 @@ namespace MareSynchronos.WebAPI
public async Task CreateConnections()
{
Logger.Verbose("Recreating Connection");
Logger.Info("Recreating Connection");
await StopConnection(_connectionCancellationTokenSource.Token);
@@ -230,7 +230,7 @@ namespace MareSynchronos.WebAPI
{
Logger.Warn(ex.Message);
Logger.Warn(ex.StackTrace ?? string.Empty);
Logger.Debug("Failed to establish connection, retrying");
Logger.Info("Failed to establish connection, retrying");
await StopConnection(token);
await Task.Delay(TimeSpan.FromSeconds(new Random().Next(5, 20)), token);
}
@@ -269,14 +269,14 @@ namespace MareSynchronos.WebAPI
CurrentUploads.Clear();
CurrentDownloads.Clear();
_uploadCancellationTokenSource?.Cancel();
Logger.Debug("Connection closed");
Logger.Info("Connection closed");
Disconnected?.Invoke();
return Task.CompletedTask;
}
private async Task MareHubOnReconnected(string? arg)
{
Logger.Debug("Connection restored");
Logger.Info("Connection restored");
await Task.Delay(TimeSpan.FromSeconds(new Random().Next(5, 10)));
_connectionDto = await _mareHub!.InvokeAsync<ConnectionDto>(Api.InvokeHeartbeat, _dalamudUtil.PlayerNameHashed);
Connected?.Invoke();
@@ -287,14 +287,14 @@ namespace MareSynchronos.WebAPI
CurrentUploads.Clear();
CurrentDownloads.Clear();
_uploadCancellationTokenSource?.Cancel();
Logger.Debug("Connection closed... Reconnecting");
Logger.Warn("Connection closed... Reconnecting");
Disconnected?.Invoke();
return Task.CompletedTask;
}
private async Task StopConnection(CancellationToken token)
{
Logger.Verbose("Stopping all connections");
Logger.Info("Stopping all connections");
if (_mareHub is not null)
{
await _mareHub.StopAsync(token);