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

more fixes

Browse Source
This commit is contained in:
rootdarkarchon
2022-12-22 23:48:04 +01:00
parent 8f35a55bd8
commit b8d61b38bd
2 changed files with 32 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
MareSynchronosServer/MareSynchronosStaticFilesServer/FileCleanupService.cs
View File

@@ -22,7 +22,7 @@ public class FileCleanupService : IHostedService
_logger = logger; _logger = logger;
_services = services; _services = services;
_configuration = configuration.GetRequiredSection("MareSynchronos"); _configuration = configuration.GetRequiredSection("MareSynchronos");
_isMainServer = string.IsNullOrEmpty(_configuration.GetValue("RemoteCacheSource", string.Empty)); _isMainServer = string.IsNullOrEmpty(_configuration.GetValue("RemoteCacheSourceUri", string.Empty));
_cacheDir = _configuration.GetValue<string>("CacheDirectory"); _cacheDir = _configuration.GetValue<string>("CacheDirectory");
} }
@@ -164,7 +164,7 @@ public class FileCleanupService : IHostedService
_metrics.DecGauge(MetricsAPI.GaugeFilesTotalSize, file.Length); _metrics.DecGauge(MetricsAPI.GaugeFilesTotalSize, file.Length);
_metrics.DecGauge(MetricsAPI.GaugeFilesTotal); _metrics.DecGauge(MetricsAPI.GaugeFilesTotal);
file.Delete(); file.Delete();
_logger.LogInformation("File not in DB, deleting: {fileName}", file.FullName); _logger.LogInformation("File not in DB, deleting: {fileName}", file.Name);
} }
ct.ThrowIfCancellationRequested(); ct.ThrowIfCancellationRequested();

44
MareSynchronosServer/MareSynchronosStaticFilesServer/GrpcFileService.cs
View File

@@ -28,26 +28,42 @@ public class GrpcFileService : FileService.FileServiceBase
var filePath = FilePathUtil.GetFilePath(_basePath, uploadMsg.Hash); var filePath = FilePathUtil.GetFilePath(_basePath, uploadMsg.Hash);
using var fileWriter = File.OpenWrite(filePath); using var fileWriter = File.OpenWrite(filePath);
var file = await _mareDbContext.Files.SingleOrDefaultAsync(f => f.Hash == uploadMsg.Hash && f.UploaderUID == uploadMsg.Uploader).ConfigureAwait(false); var file = await _mareDbContext.Files.SingleOrDefaultAsync(f => f.Hash == uploadMsg.Hash && f.UploaderUID == uploadMsg.Uploader).ConfigureAwait(false);
if (file != null) try
{ {
await fileWriter.WriteAsync(uploadMsg.FileData.ToArray()).ConfigureAwait(false);
while (await requestStream.MoveNext().ConfigureAwait(false)) if (file != null)
{ {
await fileWriter.WriteAsync(requestStream.Current.FileData.ToArray()).ConfigureAwait(false); await fileWriter.WriteAsync(uploadMsg.FileData.ToArray()).ConfigureAwait(false);
while (await requestStream.MoveNext().ConfigureAwait(false))
{
await fileWriter.WriteAsync(requestStream.Current.FileData.ToArray()).ConfigureAwait(false);
}
await fileWriter.FlushAsync().ConfigureAwait(false);
fileWriter.Close();
var fileSize = new FileInfo(filePath).Length;
file.Uploaded = true;
await _mareDbContext.SaveChangesAsync().ConfigureAwait(false);
_metricsClient.IncGauge(MetricsAPI.GaugeFilesTotal, 1);
_metricsClient.IncGauge(MetricsAPI.GaugeFilesTotalSize, fileSize);
_logger.LogInformation("User {user} uploaded file {hash}", uploadMsg.Uploader, uploadMsg.Hash);
}
}
catch (Exception ex)
{
_logger.LogWarning(ex, "Error during UploadFile");
var fileNew = await _mareDbContext.Files.SingleOrDefaultAsync(f => f.Hash == uploadMsg.Hash && f.UploaderUID == uploadMsg.Uploader).ConfigureAwait(false);
if (fileNew != null)
{
_mareDbContext.Files.Remove(fileNew);
} }
await fileWriter.FlushAsync().ConfigureAwait(false);
fileWriter.Close();
var fileSize = new FileInfo(filePath).Length;
file.Uploaded = true;
_metricsClient.IncGauge(MetricsAPI.GaugeFilesTotal, 1);
_metricsClient.IncGauge(MetricsAPI.GaugeFilesTotalSize, fileSize);
await _mareDbContext.SaveChangesAsync().ConfigureAwait(false); await _mareDbContext.SaveChangesAsync().ConfigureAwait(false);
_logger.LogInformation("User {user} uploaded file {hash}", uploadMsg.Uploader, uploadMsg.Hash);
} }
return new Empty(); return new Empty();