Skip to content

Commit 05e6ed4

Browse files
committed
Add logging, simplify validation of folder.
1 parent 91adbbf commit 05e6ed4

3 files changed

Lines changed: 6 additions & 12 deletions

File tree

src/ElevationHelper.cs

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -19,20 +19,12 @@ internal static class ElevationHelper
1919

2020
public static bool ValidateFolder(IFileProvider fileProvider, ILogger logger)
2121
{
22-
if (fileProvider.GetDirectoryContents(ELEVATION_CACHE).Any() == false)
23-
{
24-
logger.LogError($"Elevation service initialization: The folder: {ELEVATION_CACHE} does not exists, please make sure this folder exists");
25-
return false;
26-
}
27-
28-
var hgtFiles = fileProvider.GetDirectoryContents(ELEVATION_CACHE);
29-
if (hgtFiles.Any())
22+
if (fileProvider.GetDirectoryContents(ELEVATION_CACHE).Any())
3023
{
3124
return true;
3225
}
33-
logger.LogError($"Elevation service initialization: There are no file in folder: {ELEVATION_CACHE}");
26+
logger.LogError($"Elevation service initialization: The folder: {ELEVATION_CACHE} does not exists, please make sure this folder exists");
3427
return false;
35-
3628
}
3729

3830
public static Coordinate FileNameToKey(string fileName)

src/InMemoryElevationProvider.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ public InMemoryElevationProvider(IWebHostEnvironment webHostEnvironment, ILogger
3636
/// <inheritdoc/>
3737
public async Task Initialize()
3838
{
39+
_logger.LogInformation("Starting Initialization of In Memory Elevation Provider.");
3940
if (!ElevationHelper.ValidateFolder(_fileProvider, _logger))
4041
{
4142
return;
@@ -64,7 +65,7 @@ public async Task Initialize()
6465
}
6566

6667
await Task.WhenAll(_initializationTaskPerLatLng.Values);
67-
_logger.LogInformation("Initialization complete.");
68+
_logger.LogInformation("Finished Initialization.");
6869
}
6970

7071
/// <inheritdoc/>

src/MemoryMapElevationProvider.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ public MemoryMapElevationProvider(IWebHostEnvironment webHostEnvironment, ILogge
4343
/// </summary>
4444
public Task Initialize()
4545
{
46+
_logger.LogInformation("Starting Initialization of Memory Map Elevation Provider.");
4647
if (!ElevationHelper.ValidateFolder(_fileProvider, _logger))
4748
{
4849
return Task.CompletedTask;
@@ -64,7 +65,7 @@ public Task Initialize()
6465
_initializationAvailableFiles[key] = (hgtFile.PhysicalPath, hgtFile.Length);
6566
}
6667

67-
_logger.LogInformation("Initialization complete.");
68+
_logger.LogInformation("Finished Initialization.");
6869
return Task.CompletedTask;
6970
}
7071

0 commit comments

Comments
 (0)