cyberpresidentvanellope/tgstation-server
1
0
Fork 0
mirror of https://github.com/tgstation/tgstation-server.git synced 2026-08-28 23:52:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix double database context attach

Browse Source
This commit is contained in:
Jordan Brown
2021-08-31 10:43:59 -04:00
parent ad75c3444c
commit 176035d444
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Tgstation.Server.Host/Components/Instance.cs
+9 -4
View File
@@ -316,6 +316,7 @@ namespace Tgstation.Server.Host.Components
RevisionInformation currentRevInfo = null;
var hasDbChanges = false;
Models.Instance attachedInstance = null;
async Task UpdateRevInfo(string currentHead, bool onOrigin, IEnumerable<RevInfoTestMerge> updatedTestMerges)
{
if (currentRevInfo == null)
@@ -327,10 +328,15 @@ namespace Tgstation.Server.Host.Components
onOrigin = true;
}
var attachedInstance = new Models.Instance
if (attachedInstance == null)
{
Id = metadata.Id,
};
attachedInstance = new Models.Instance
{
Id = metadata.Id,
};
databaseContext.Instances.Attach(attachedInstance);
}
var oldRevInfo = currentRevInfo;
currentRevInfo = new RevisionInformation
{
@@ -345,7 +351,6 @@ namespace Tgstation.Server.Host.Components
currentRevInfo.ActiveTestMerges = new List<RevInfoTestMerge>(
updatedTestMerges ?? oldRevInfo.ActiveTestMerges);
databaseContext.Instances.Attach(attachedInstance);
databaseContext.RevisionInformations.Add(currentRevInfo);
hasDbChanges = true;
}