ClemensFischer/XAML-Map-Control
1
0
Fork 0
mirror of https://github.com/ClemensFischer/XAML-Map-Control.git synced 2026-04-05 14:37:01 +00:00
Code Issues Projects Releases Packages Wiki Activity

Support .NET logging

Browse source
This commit is contained in:
ClemensFischer 2025-03-30 16:35:10 +02:00
parent 1c47b358eb
commit 6f6b45cfbf
5 changed files with 150 additions and 78 deletions
Download patch file Download diff file Expand all files Collapse all files

57
Caches/SQLiteCache/SQLiteCache.cs
View file

@ -1,13 +1,23 @@
using Microsoft.Extensions.Caching.Distributed;
using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Options;
using System;
using System.Data.SQLite;
using System.Diagnostics;
using System.IO;
using System.Threading;
using System.Threading.Tasks;
namespace MapControl.Caching
{
public class SQLiteCacheOptions : IOptions<SQLiteCacheOptions>
{
public SQLiteCacheOptions Value => this;
public string Path { get; set; }
public TimeSpan ExpirationScanFrequency { get; set; } = TimeSpan.FromHours(1);
}
/// <summary>
/// IDistributedCache implementation based on System.Data.SQLite, https://system.data.sqlite.org/.
/// </summary>
@ -15,14 +25,27 @@ namespace MapControl.Caching
{
private readonly SQLiteConnection connection;
private readonly Timer timer;
private readonly ILogger logger;
public SQLiteCache(string path)
: this(path, TimeSpan.FromHours(1))
public SQLiteCache(string path, ILoggerFactory loggerFactory = null)
: this(new SQLiteCacheOptions { Path = path }, loggerFactory)
{
}
public SQLiteCache(string path, TimeSpan expirationScanFrequency)
public SQLiteCache(IOptions<SQLiteCacheOptions> optionsAccessor, ILoggerFactory loggerFactory = null)
: this(optionsAccessor.Value, loggerFactory)
{
}
public SQLiteCache(SQLiteCacheOptions options, ILoggerFactory loggerFactory = null)
{
if (loggerFactory != null)
{
logger = loggerFactory.CreateLogger<SQLiteCache>();
}
var path = options.Path;
if (string.IsNullOrEmpty(path) || string.IsNullOrEmpty(Path.GetExtension(path)))
{
path = Path.Combine(path ?? "", "TileCache.sqlite");
@ -41,11 +64,11 @@ namespace MapControl.Caching
command.ExecuteNonQuery();
}
Debug.WriteLine($"{nameof(SQLiteCache)}: Opened database {path}");
logger?.LogInformation("Opened database {path}", path);
if (expirationScanFrequency > TimeSpan.Zero)
if (options.ExpirationScanFrequency > TimeSpan.Zero)
{
timer = new Timer(_ => DeleteExpiredItems(), null, TimeSpan.Zero, expirationScanFrequency);
timer = new Timer(_ => DeleteExpiredItems(), null, TimeSpan.Zero, options.ExpirationScanFrequency);
}
}
@ -70,7 +93,7 @@ namespace MapControl.Caching
}
catch (Exception ex)
{
Debug.WriteLine($"{nameof(SQLiteCache)}.Get({key}): {ex.Message}");
logger?.LogError(ex, "Get({key})", key);
}
}
@ -92,7 +115,7 @@ namespace MapControl.Caching
}
catch (Exception ex)
{
Debug.WriteLine($"{nameof(SQLiteCache)}.GetAsync({key}): {ex.Message}");
logger?.LogError(ex, "GetAsync({key})", key);
}
}
@ -112,7 +135,7 @@ namespace MapControl.Caching
}
catch (Exception ex)
{
Debug.WriteLine($"{nameof(SQLiteCache)}.Set({key}): {ex.Message}");
logger?.LogError(ex, "Set({key})", key);
}
}
}
@ -130,7 +153,7 @@ namespace MapControl.Caching
}
catch (Exception ex)
{
Debug.WriteLine($"{nameof(SQLiteCache)}.SetAsync({key}): {ex.Message}");
logger?.LogError(ex, "SetAsync({key})", key);
}
}
}
@ -157,7 +180,7 @@ namespace MapControl.Caching
}
catch (Exception ex)
{
Debug.WriteLine($"{nameof(SQLiteCache)}.Remove({key}): {ex.Message}");
logger?.LogError(ex, "Remove({key})", key);
}
}
}
@ -175,28 +198,28 @@ namespace MapControl.Caching
}
catch (Exception ex)
{
Debug.WriteLine($"{nameof(SQLiteCache)}.RemoveAsync({key}): {ex.Message}");
logger?.LogError(ex, "RemoveAsync({key})", key);
}
}
}
public void DeleteExpiredItems()
{
long deleted;
long deletedItemsCount;
using (var command = DeleteExpiredItemsCommand())
{
deleted = (long)command.ExecuteScalar();
deletedItemsCount = (long)command.ExecuteScalar();
}
if (deleted > 0)
if (deletedItemsCount > 0)
{
using (var command = new SQLiteCommand("vacuum", connection))
{
command.ExecuteNonQuery();
}
Debug.WriteLine($"{nameof(SQLiteCache)}: Deleted {deleted} expired items");
logger?.LogInformation("Deleted {count} expired items", deletedItemsCount);
}
}

2
Caches/SQLiteCache/SQLiteCache.csproj
View file

@ -12,6 +12,8 @@
<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Caching.Abstractions" Version="9.0.3" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.3" />
<PackageReference Include="Microsoft.Extensions.Options" Version="9.0.3" />
<PackageReference Include="System.Data.SQLite.Core" Version="1.0.119" />
</ItemGroup>
</Project>