diff --git a/src/Plugins/MinIO/LoggerMethods.cs b/src/Plugins/MinIO/LoggerMethods.cs index b32477a..a9fa36f 100644 --- a/src/Plugins/MinIO/LoggerMethods.cs +++ b/src/Plugins/MinIO/LoggerMethods.cs @@ -20,8 +20,8 @@ namespace Monai.Deploy.Storage.MinIO { public static partial class LoggerMethods { - [LoggerMessage(EventId = 20000, Level = LogLevel.Error, Message = "Error listing objects in bucket '{bucketName}'.")] - public static partial void ListObjectError(this ILogger logger, string bucketName); + [LoggerMessage(EventId = 20000, Level = LogLevel.Error, Message = "Error listing objects in bucket '{bucketName}' with error: {error}")] + public static partial void ListObjectError(this ILogger logger, string bucketName, string error); [LoggerMessage(EventId = 20001, Level = LogLevel.Error, Message = "File '{path}' could not be found in '{bucketName}'.")] public static partial void FileNotFoundError(this ILogger logger, string bucketName, string path); diff --git a/src/Plugins/MinIO/MinIoStorageService.cs b/src/Plugins/MinIO/MinIoStorageService.cs index 7981676..03d55d0 100644 --- a/src/Plugins/MinIO/MinIoStorageService.cs +++ b/src/Plugins/MinIO/MinIoStorageService.cs @@ -339,7 +339,7 @@ private async Task> ListObjectsUsingClient(MinioClient cl }, error => { - _logger.ListObjectError(bucketName); + _logger.ListObjectError(bucketName, error.Message); }, () => completedEvent.Set(), cancellationToken); diff --git a/src/Plugins/MinIO/StorageAdminService.cs b/src/Plugins/MinIO/StorageAdminService.cs index 0696d7d..1e30f41 100644 --- a/src/Plugins/MinIO/StorageAdminService.cs +++ b/src/Plugins/MinIO/StorageAdminService.cs @@ -169,17 +169,13 @@ private Process CreateProcess(string cmd) public async Task HasConnectionAsync() { var result = await GetConnectionAsync().ConfigureAwait(false); - return result.Any(r => r.Equals(_serviceName)); + return result.Any(r => r.Trim().Equals(_serviceName)); } public async Task> GetConnectionAsync() => await ExecuteAsync(_get_connections_cmd).ConfigureAwait(false); public async Task SetConnectionAsync() { - if (await HasConnectionAsync().ConfigureAwait(false)) - { - return true; - } var result = await ExecuteAsync(_set_connection_cmd).ConfigureAwait(false); if (result.Any(r => r.Contains($"Added `{_serviceName}` successfully."))) { diff --git a/src/Storage/IServiceCollectionExtension.cs b/src/Storage/IServiceCollectionExtension.cs index c77ac7b..00ddbd0 100644 --- a/src/Storage/IServiceCollectionExtension.cs +++ b/src/Storage/IServiceCollectionExtension.cs @@ -62,7 +62,7 @@ public static IServiceCollection AddMonaiDeployStorageService( this IServiceCollection services, string fullyQualifiedTypeName, IFileSystem fileSystem, - HealthCheckOptions healthCheckOptions = HealthCheckOptions.ServiceHealthCheck & HealthCheckOptions.AdminServiceHealthCheck, + HealthCheckOptions healthCheckOptions = HealthCheckOptions.ServiceHealthCheck | HealthCheckOptions.AdminServiceHealthCheck, HealthStatus? failureStatus = null, IEnumerable? tags = null, TimeSpan? timeout = null)