diff --git a/Robust.Cdn/Jobs/IngestNewCdnContentJob.cs b/Robust.Cdn/Jobs/IngestNewCdnContentJob.cs index 9b38cbb..c86ccdf 100644 --- a/Robust.Cdn/Jobs/IngestNewCdnContentJob.cs +++ b/Robust.Cdn/Jobs/IngestNewCdnContentJob.cs @@ -64,6 +64,7 @@ public async Task Execute(IJobExecutionContext context) finally { transaction.Dispose(); + logger.LogInformation("Ingestion for fork \"{Fork}\" finished", fork); } await QueueManifestAvailable(fork, newVersions); @@ -111,6 +112,10 @@ private void IngestNewVersions( try { var versionIdx = 0; + + if (newVersions.Count < 1) + logger.LogWarning("No versions provided to ingest"); + foreach (var version in newVersions) { if (versionIdx % 5 == 0) @@ -335,7 +340,8 @@ private void IngestNewVersions( private List FindNewVersions(string fork, SqliteConnection con) { - using var stmtCheckVersion = con.Handle!.Prepare("SELECT 1 FROM ContentVersion WHERE Version = ?"); + var forkId = EnsureForkCreated(fork, con); + using var stmtCheckVersion = con.Handle!.Prepare("SELECT 1 FROM ContentVersion WHERE Version = ? AND ForkId = ?"); var newVersions = new List<(string, DateTime)>(); @@ -353,6 +359,7 @@ private List FindNewVersions(string fork, SqliteConnection con) stmtCheckVersion.Reset(); stmtCheckVersion.BindString(1, version); + stmtCheckVersion.BindInt(2, forkId); if (stmtCheckVersion.Step() == raw.SQLITE_ROW) {