Skip to content

Commit

Permalink
Merge pull request #1791 from tgstation/MinorSpuriousDebugInfo [DMDep…
Browse files Browse the repository at this point in the history
…loy][TGSDeploy]

v6.3.1: Fix a 500 error. Add a debug message
  • Loading branch information
Cyberboss authored Feb 27, 2024
2 parents 57512a4 + 436938e commit cde1ea6
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 4 deletions.
2 changes: 1 addition & 1 deletion build/Version.props
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<!-- Integration tests will ensure they match across the board -->
<Import Project="WebpanelVersion.props" />
<PropertyGroup>
<TgsCoreVersion>6.3.0</TgsCoreVersion>
<TgsCoreVersion>6.3.1</TgsCoreVersion>
<TgsConfigVersion>5.1.0</TgsConfigVersion>
<TgsApiVersion>10.2.0</TgsApiVersion>
<TgsCommonLibraryVersion>7.0.0</TgsCommonLibraryVersion>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -147,8 +147,9 @@ public void AbortUnauthedConnections(User user)
return old;
});

foreach (var context in connections!)
context.Abort();
if (connections != null)
foreach (var context in connections)
context.Abort();
}
}
}
4 changes: 3 additions & 1 deletion tests/Tgstation.Server.Tests/Live/Instance/ChatTest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@

using Microsoft.VisualStudio.TestTools.UnitTesting;

using Newtonsoft.Json;

using Tgstation.Server.Api.Models;
using Tgstation.Server.Api.Models.Request;
using Tgstation.Server.Api.Models.Response;
Expand Down Expand Up @@ -196,7 +198,7 @@ async Task RunDiscord(CancellationToken cancellationToken)
.OrderBy(x => x.StartedAt)
.FirstOrDefault();

Assert.IsNotNull(reconnectJob);
Assert.IsNotNull(reconnectJob, $"Jobs: {JsonConvert.SerializeObject(jobs)}");
await WaitForJob(reconnectJob, 60, false, null, cancellationToken);

var channelIdStr = Environment.GetEnvironmentVariable("TGS_TEST_DISCORD_CHANNEL");
Expand Down

0 comments on commit cde1ea6

Please sign in to comment.