clean up of log messages

Signed-off-by: Neil South <[email protected]>

Author: neildsouth

src/Configuration/ConfigurationValidator.cs

@@ -120,7 +120,7 @@ private bool IsValidDirectory(string source, string directory)
         private bool IsValidBucketName(string source, string bucketName)
         {
             var valid = IsNotNullOrWhiteSpace(source, bucketName);
-            var regex = new Regex("(?=^.{3,63}$)(^[a-z0-9]+[a-z0-9\\-]+[a-z0-9]+$)");
+            var regex = new Regex("(?=^.{3,63}$)(^[a-z0-9]+[a-z0-9\\-]+[a-z0-9]+$)", new RegexOptions(), TimeSpan.FromSeconds(5));
             if (!regex.IsMatch(bucketName))
             {
                 valid = false;

src/InformaticsGateway/Logging/Log.4000.ObjectUploadService.cs

@@ -27,20 +27,20 @@ public static partial class Log
         [LoggerMessage(EventId = 4001, Level = LogLevel.Debug, Message = "Upload statistics: {threads} threads, {seconds} seconds.")]
         public static partial void UploadStats(this ILogger logger, int threads, double seconds);
 
-        [LoggerMessage(EventId = 4002, Level = LogLevel.Debug, Message = "Uploading file to temporary store at {filePath}.")]
-        public static partial void UploadingFileToTemporaryStore(this ILogger logger, string filePath);
+        [LoggerMessage(EventId = 4002, Level = LogLevel.Debug, Message = "Uploading file to storeage at {filePath}.")]
+        public static partial void UploadingFileToStoreage(this ILogger logger, string filePath);
 
         [LoggerMessage(EventId = 4003, Level = LogLevel.Information, Message = "Instance queued for upload {identifier}. Items in queue {count} using memory {memoryUsageKb}KB.")]
         public static partial void InstanceAddedToUploadQueue(this ILogger logger, string identifier, int count, double memoryUsageKb);
 
         [LoggerMessage(EventId = 4004, Level = LogLevel.Debug, Message = "Error removing objects that are pending upload during startup.")]
         public static partial void ErrorRemovingPendingUploadObjects(this ILogger logger, Exception ex);
 
-        [LoggerMessage(EventId = 4005, Level = LogLevel.Error, Message = "Error uploading temporary store. Waiting {timeSpan} before next retry. Retry attempt {retryCount}.")]
+        [LoggerMessage(EventId = 4005, Level = LogLevel.Error, Message = "Error uploading storeage. Waiting {timeSpan} before next retry. Retry attempt {retryCount}.")]
         public static partial void ErrorUploadingFileToTemporaryStore(this ILogger logger, TimeSpan timespan, int retryCount, Exception ex);
 
-        [LoggerMessage(EventId = 4006, Level = LogLevel.Information, Message = "File uploaded to temporary store at {filePath}.")]
-        public static partial void UploadedFileToTemporaryStore(this ILogger logger, string filePath);
+        [LoggerMessage(EventId = 4006, Level = LogLevel.Information, Message = "File uploaded to storeage at {filePath}.")]
+        public static partial void UploadedFileToStoreage(this ILogger logger, string filePath);
 
         [LoggerMessage(EventId = 4007, Level = LogLevel.Debug, Message = "Items in queue {count}.")]
         public static partial void InstanceInUploadQueue(this ILogger logger, int count);

src/InformaticsGateway/Services/Storage/ObjectUploadService.cs

@@ -225,7 +225,7 @@ private async Task<bool> VerifyExists(string path, CancellationToken cancellatio
 
         private async Task UploadFile(StorageObjectMetadata storageObjectMetadata, string source, List<string> workflows, string payloadId, CancellationToken cancellationToken)
         {
-            _logger.UploadingFileToTemporaryStore(storageObjectMetadata.TemporaryPath);
+            _logger.UploadingFileToStoreage(storageObjectMetadata.TemporaryPath);
             var metadata = new Dictionary<string, string>
                 {
                     { FileMetadataKeys.Source, source },
@@ -257,7 +257,7 @@ await _storageService.PutObjectAsync(
                        metadata,
                        cancellationToken).ConfigureAwait(false);
                    storageObjectMetadata.SetUploaded(_configuration.Value.Storage.TemporaryStorageBucket); // deletes local file and sets uploaded to true
-                   _logger.UploadedFileToTemporaryStore(storageObjectMetadata.TemporaryPath);
+                   _logger.UploadedFileToStoreage(storageObjectMetadata.TemporaryPath);
                    storageObjectMetadata.SetMoved(_configuration.Value.Storage.StorageServiceBucketName); // set bucket, date moved, and move complete
                })
                .ConfigureAwait(false);