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

Merge pull request #1072 from tgstation/Day1s [TGSDeploy]

Browse Source 
4.4.1
This commit is contained in:
Jordan Brown
2020-07-10 13:54:17 -04:00
committed by GitHub
parent ef2edacad9 e664cab7d5
commit 5432ae41cc
10 changed files with 102 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/Version.props
+1 -1
View File
@@ -2,7 +2,7 @@
<PropertyGroup>
<!-- This is the authorative version list -->
<!-- Integration tests will ensure they match across the board -->
<TgsCoreVersion>4.4.0</TgsCoreVersion>
<TgsCoreVersion>4.4.1</TgsCoreVersion>
<TgsConfigVersion>2.0.0</TgsConfigVersion>
<TgsApiVersion>7.0.1</TgsApiVersion>
<TgsClientVersion>8.0.0</TgsClientVersion>
src/Tgstation.Server.Host/Components/Deployment/DmbFactory.cs
+1
View File
@@ -248,6 +248,7 @@ namespace Tgstation.Server.Host.Components.Deployment
if (!dmbExistsAtRoot)
{
logger.LogTrace("Didn't find .dmb at game directory root, checking A/B dirs...");
var primaryCheckTask = ioManager.FileExists(
ioManager.ConcatPath(
newProvider.Directory,
src/Tgstation.Server.Host/Components/InstanceManager.cs
+16 -4
View File
@@ -285,7 +285,7 @@ namespace Tgstation.Server.Host.Components
var factoryStartup = instanceFactory.StartAsync(cancellationToken);
await databaseSeeder.Initialize(databaseContext, cancellationToken).ConfigureAwait(false);
await jobManager.StartAsync(cancellationToken).ConfigureAwait(false);
var dbInstances = databaseContext
var dbInstances = await databaseContext
.Instances
.AsQueryable()
.Where(x => x.Online.Value)
@@ -293,10 +293,22 @@ namespace Tgstation.Server.Host.Components
.Include(x => x.ChatSettings)
.ThenInclude(x => x.Channels)
.Include(x => x.DreamDaemonSettings)
.ToAsyncEnumerable();
var tasks = new List<Task>();
.ToListAsync(cancellationToken)
.ConfigureAwait(false);
await factoryStartup.ConfigureAwait(false);
await dbInstances.ForEachAsync(metadata => tasks.Add(metadata.Online.Value ? OnlineInstance(metadata, cancellationToken) : Task.CompletedTask), cancellationToken).ConfigureAwait(false);
var tasks = dbInstances.Select(
async metadata =>
{
try
{
await OnlineInstance(metadata, cancellationToken).ConfigureAwait(false);
}
catch (Exception ex)
{
logger.LogError("Failed to online instance {0}! Exception: {0}", ex);
}
})
.ToList();
await Task.WhenAll(tasks).ConfigureAwait(false);
logger.LogInformation("Server ready!");
readyTcs.SetResult(null);
src/Tgstation.Server.Host/Components/Session/SessionPersistor.cs
+8 -1
View File
@@ -153,9 +153,16 @@ namespace Tgstation.Server.Host.Components.Session
return null;
}
var dmb = await dmbFactory.FromCompileJob(result.CompileJob, cancellationToken).ConfigureAwait(false);
if (dmb == null)
{
logger.LogError("Unable to reattach! Could not load .dmb!");
return null;
}
var info = new ReattachInformation(
result,
await dmbFactory.FromCompileJob(result.CompileJob, cancellationToken).ConfigureAwait(false),
dmb,
topicTimeout.Value);
logger.LogDebug("Reattach information loaded: {0}", info);
src/Tgstation.Server.Host/Components/Watchdog/PosixWatchdogFactory.cs
+2 -1
View File
@@ -1,5 +1,6 @@
using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Options;
using System;
using Tgstation.Server.Api.Models.Internal;
using Tgstation.Server.Host.Components.Chat;
using Tgstation.Server.Host.Components.Deployment;
@@ -73,6 +74,6 @@ namespace Tgstation.Server.Host.Components.Watchdog
LoggerFactory.CreateLogger<PosixWatchdog>(),
settings,
instance,
settings.AutoStart.Value);
settings.AutoStart ?? throw new ArgumentNullException(nameof(settings)));
}
}
src/Tgstation.Server.Host/Components/Watchdog/WatchdogFactory.cs
+1 -1
View File
@@ -97,6 +97,6 @@ namespace Tgstation.Server.Host.Components.Watchdog
LoggerFactory.CreateLogger<BasicWatchdog>(),
settings,
instance,
settings.AutoStart.Value);
settings.AutoStart ?? throw new ArgumentNullException(nameof(settings)));
}
}
src/Tgstation.Server.Host/Components/Watchdog/WindowsWatchdogFactory.cs
+1 -1
View File
@@ -80,6 +80,6 @@ namespace Tgstation.Server.Host.Components.Watchdog
LoggerFactory.CreateLogger<WindowsWatchdog>(),
settings,
instance,
settings.AutoStart.Value);
settings.AutoStart ?? throw new ArgumentNullException(nameof(settings)));
}
}
src/Tgstation.Server.Host/Controllers/InstanceController.cs
+47
View File
@@ -393,6 +393,9 @@ namespace Tgstation.Server.Host.Controllers
if (originalModel == default(Models.Instance))
return Gone();
if (ValidateInstanceOnlineStatus(originalModel))
await DatabaseContext.Save(cancellationToken).ConfigureAwait(false);
var userRights = (InstanceManagerRights)AuthenticationContext.GetRight(RightsType.InstanceManager);
bool CheckModified<T>(Expression<Func<Api.Models.Instance, T>> expression, InstanceManagerRights requiredRight)
{
@@ -556,6 +559,13 @@ namespace Tgstation.Server.Host.Controllers
.ToListAsync(cancellationToken)
.ConfigureAwait(false);
var needsUpdate = false;
foreach (var instance in instances)
needsUpdate |= ValidateInstanceOnlineStatus(instance);
if (needsUpdate)
await DatabaseContext.Save(cancellationToken).ConfigureAwait(false);
var apis = instances.Select(x => x.ToApi());
foreach(var I in moveJobs)
apis.Where(x => x.Id == I.Instance.Id).First().MoveJob = I.ToApi(); // if this .First() fails i will personally murder kevinz000 because I just know he is somehow responsible
@@ -594,6 +604,9 @@ namespace Tgstation.Server.Host.Controllers
if (instance == null)
return Gone();
if (ValidateInstanceOnlineStatus(instance))
await DatabaseContext.Save(cancellationToken).ConfigureAwait(false);
if (cantList && !instance.InstanceUsers.Any(instanceUser => instanceUser.UserId == AuthenticationContext.User.Id &&
(instanceUser.ByondRights != ByondRights.None ||
instanceUser.ChatBotRights != ChatBotRights.None ||
@@ -651,5 +664,39 @@ namespace Tgstation.Server.Host.Controllers
return NoContent();
}
/// <summary>
/// Corrects discrepencies between the <see cref="Api.Models.Instance.Online"/> status of <see cref="IInstance"/>s in the database vs the service.
/// </summary>
/// <param name="metadata">The <see cref="Models.Instance"/> to check.</param>
/// <returns><see langword="true"/> if an unsaved DB update was made, <see langword="false"/> otherwise.</returns>
bool ValidateInstanceOnlineStatus(Models.Instance metadata)
{
bool online;
try
{
instanceManager.GetInstance(metadata);
online = true;
}
catch (InvalidOperationException ex)
{
Logger.LogDebug("Expected instance offline exception: {0}", ex);
online = false;
}
if (metadata.Online.Value == online)
return false;
const string OfflineWord = "offline";
const string OnlineWord = "online";
Logger.LogWarning(
"Instance {0} is says it's {1} in the database, but it is actually {2} in the service. Updating the database to reflect this...",
online ? OfflineWord : OnlineWord,
online ? OnlineWord : OfflineWord);
metadata.Online = online;
return true;
}
}
}
src/Tgstation.Server.Host/Database/DatabaseSeeder.cs
+24 -21
View File
@@ -133,32 +133,35 @@ namespace Tgstation.Server.Host.Database
instance.Path = instance.Path.Replace('\\', '/');
}
var ids = await databaseContext
.DreamDaemonSettings
.AsQueryable()
.Where(x => x.TopicRequestTimeout == 0)
.Select(x => x.Id)
.ToListAsync(cancellationToken)
.ConfigureAwait(false);
var rowsUpdated = ids.Count;
foreach (var id in ids)
if (generalConfiguration.ByondTopicTimeout != 0)
{
var newDDSettings = new DreamDaemonSettings
var ids = await databaseContext
.DreamDaemonSettings
.AsQueryable()
.Where(x => x.TopicRequestTimeout == 0)
.Select(x => x.Id)
.ToListAsync(cancellationToken)
.ConfigureAwait(false);
var rowsUpdated = ids.Count;
foreach (var id in ids)
{
Id = id
};
var newDDSettings = new DreamDaemonSettings
{
Id = id
};
databaseContext.DreamDaemonSettings.Attach(newDDSettings);
newDDSettings.TopicRequestTimeout = generalConfiguration.ByondTopicTimeout;
databaseContext.DreamDaemonSettings.Attach(newDDSettings);
newDDSettings.TopicRequestTimeout = generalConfiguration.ByondTopicTimeout;
}
if (rowsUpdated > 0)
logger.LogInformation(
"Updated {0} instances to use database backed BYOND topic timeouts from configuration setting of {1}",
rowsUpdated,
generalConfiguration.ByondTopicTimeout);
}
if (rowsUpdated > 0)
logger.LogInformation(
"Updated {0} instances to use database backed BYOND topic timeouts from configuration setting of {1}",
rowsUpdated,
generalConfiguration.ByondTopicTimeout);
await databaseContext.Save(cancellationToken).ConfigureAwait(false);
}
src/Tgstation.Server.Host/Server.cs
+1 -1
View File
@@ -286,7 +286,7 @@ namespace Tgstation.Server.Host
}
RestartRequested = true;
propagatedException = exception;
propagatedException ??= exception;
}
if (exception == null)