diff --git a/TGS.Server/ChatCommands/ChatCommand.cs b/TGS.Server/ChatCommands/ChatCommand.cs index f742fadbf6..96d5803ca1 100644 --- a/TGS.Server/ChatCommands/ChatCommand.cs +++ b/TGS.Server/ChatCommands/ChatCommand.cs @@ -20,7 +20,7 @@ namespace TGS.Server.ChatCommands /// /// Shorthand for accessing /// - protected ServerInstance Instance { get { return CommandInfo.Value.Server; } } + protected Instance Instance { get { return CommandInfo.Value.Server; } } /// public override ExitCode DoRun(IList parameters) diff --git a/TGS.Server/ChatCommands/CommandInfo.cs b/TGS.Server/ChatCommands/CommandInfo.cs index 4e650eaf89..4108fd051f 100644 --- a/TGS.Server/ChatCommands/CommandInfo.cs +++ b/TGS.Server/ChatCommands/CommandInfo.cs @@ -18,8 +18,8 @@ /// public string Speaker { get; set; } /// - /// A reference to the that runs the that heard the + /// A reference to the that runs the that heard the /// - public ServerInstance Server { get; set; } + public Instance Server { get; set; } } } diff --git a/TGS.Server/DeprecatedInstanceConfig.cs b/TGS.Server/DeprecatedInstanceConfig.cs index 33b3b1c8c9..091a43f39b 100644 --- a/TGS.Server/DeprecatedInstanceConfig.cs +++ b/TGS.Server/DeprecatedInstanceConfig.cs @@ -9,7 +9,7 @@ namespace TGS.Server class DeprecatedInstanceConfig : InstanceConfig { /// - /// The default directory + /// The default directory /// const string DefaultInstallationPath = "C:\\tgstation-server-3"; @@ -94,9 +94,9 @@ namespace TGS.Server public DeprecatedInstanceConfig() : base(DefaultInstallationPath) { } /// - /// Construct a for a at + /// Construct a for a at /// - /// The path to the + /// The path to the public DeprecatedInstanceConfig(string path) : base(path) { } /// diff --git a/TGS.Server/EventID.cs b/TGS.Server/EventID.cs index 0f7267594b..5fd0a44696 100644 --- a/TGS.Server/EventID.cs +++ b/TGS.Server/EventID.cs @@ -3,7 +3,7 @@ namespace TGS.Server { /// - /// Various events and their IDs in no particular order. Found in the Windows event log. These key incremented by 100 and are guaranteed to never be reused in the future. In the windows event viewer, these IDs will be offset by the to distinguish events between instances. Each event ID may be information, a warning, or error and will be documented accordingly. Warnings will occur due to user, data, or network errors. Errors will occur due to filesystem errors or hard faults + /// Various events and their IDs in no particular order. Found in the Windows event log. These key incremented by 100 and are guaranteed to never be reused in the future. In the windows event viewer, these IDs will be offset by the to distinguish events between instances. Each event ID may be information, a warning, or error and will be documented accordingly. Warnings will occur due to user, data, or network errors. Errors will occur due to filesystem errors or hard faults /// public enum EventID : int { @@ -33,7 +33,7 @@ namespace TGS.Server /// BYONDUpdateFail = 600, /// - /// Info: When the BYOND updater successfully staged a revision but could not apply it due to the being active + /// Info: When the BYOND updater successfully staged a revision but could not apply it due to the being active /// BYONDUpdateStaged = 700, /// @@ -41,7 +41,7 @@ namespace TGS.Server /// BYONDUpdateComplete = 800, /// - /// Error: Failed to move the with TGS.Interface.Components.ITGAdministration.MoveServer(string) + /// Error: Failed to move the with TGS.Interface.Components.ITGAdministration.MoveServer(string) /// [Obsolete("Not in use anymore", true)] ServerMoveFailed = 900, @@ -143,7 +143,7 @@ namespace TGS.Server [Obsolete("Not in use anymore", true)] TopicFailed = 3100, /// - /// Info: When the has been generated + /// Info: When the has been generated /// CommsKeySet = 3200, /// @@ -225,11 +225,11 @@ namespace TGS.Server /// RepoPRMergeFail = 5100, /// - /// Info: Successfully committed the paths specified in the synchronize_directories field of the 's TGS3.json + /// Info: Successfully committed the paths specified in the synchronize_directories field of the 's TGS3.json /// RepoCommit = 5200, /// - /// Warning: An error occurred while committing the paths specified in the synchronize_directories field of the 's TGS3.json + /// Warning: An error occurred while committing the paths specified in the synchronize_directories field of the 's TGS3.json /// RepoCommitFail = 5300, /// @@ -249,15 +249,15 @@ namespace TGS.Server /// RepoChangelogFail = 5700, /// - /// Info: When the dll is updated for the + /// Info: When the dll is updated for the /// BridgeDLLUpdated = 5800, /// - /// Error: An error occurred while updating the dll for the + /// Error: An error occurred while updating the dll for the /// BridgeDLLUpdateFail = 5900, /// - /// Error: An error occurred while starting the + /// Error: An error occurred while starting the /// InstanceInitializationFailure = 6000, /// @@ -265,15 +265,15 @@ namespace TGS.Server /// ServiceShutdownFail = 6100, /// - /// Info: When the reboots in BYOND + /// Info: When the reboots in BYOND /// WorldReboot = 6200, /// - /// Info: When the output of is applied to the live + /// Info: When the output of is applied to the live /// ServerUpdateApplied = 6300, /// - /// Warning: When an exception occurs during a operation + /// Warning: When an exception occurs during a operation /// ChatBroadcastFail = 6400, /// @@ -287,7 +287,7 @@ namespace TGS.Server /// Submodule = 6600, /// - /// This event is of type or . It occurs when a user different from the previous one tries and either succeeds or fails to access a . DreamDaemon itself successfully accessing will not trigger this + /// This event is of type or . It occurs when a user different from the previous one tries and either succeeds or fails to access a . DreamDaemon itself successfully accessing will not trigger this /// Authentication = 6700, /// @@ -303,7 +303,7 @@ namespace TGS.Server /// InteropCallException = 7000, /// - /// Warning: When the running DreamDaemon code does not have the correct API to talk to the + /// Warning: When the running DreamDaemon code does not have the correct API to talk to the /// APIVersionMismatch = 7100, /// diff --git a/TGS.Server/ServerInstance/Administration.cs b/TGS.Server/Instance/Administration.cs similarity index 95% rename from TGS.Server/ServerInstance/Administration.cs rename to TGS.Server/Instance/Administration.cs index eb8a4b3c2e..7c795857c1 100644 --- a/TGS.Server/ServerInstance/Administration.cs +++ b/TGS.Server/Instance/Administration.cs @@ -10,10 +10,10 @@ namespace TGS.Server { //note this only works with MACHINE LOCAL groups and admins for now //if someone wants AD shit, code it yourself - sealed partial class ServerInstance : ServiceAuthorizationManager, ITGAdministration + sealed partial class Instance : ServiceAuthorizationManager, ITGAdministration { /// - /// The of the Windows group authorized to access the + /// The of the Windows group authorized to access the /// SecurityIdentifier TheDroidsWereLookingFor; /// @@ -21,7 +21,7 @@ namespace TGS.Server /// object authLock = new object(); /// - /// The of the last to attempt to access the + /// The of the last to attempt to access the /// string LastSeenUser; @@ -70,7 +70,7 @@ namespace TGS.Server /// /// The name of the group to search for /// Recursive parameter used to check for the group using instead of - /// The name of the group allowed to access the if it could be found, otherwise + /// The name of the group allowed to access the if it could be found, otherwise string FindTheDroidsWereLookingFor(string search = null, bool useDomain = false) { RootAuthorizationManager.InstanceAuthManagers.Add(this); diff --git a/TGS.Server/ServerInstance/Byond.cs b/TGS.Server/Instance/Byond.cs similarity index 96% rename from TGS.Server/ServerInstance/Byond.cs rename to TGS.Server/Instance/Byond.cs index fa725720ad..643a896292 100644 --- a/TGS.Server/ServerInstance/Byond.cs +++ b/TGS.Server/Instance/Byond.cs @@ -10,7 +10,7 @@ using TGS.Interface.Components; namespace TGS.Server { - sealed partial class ServerInstance : ITGByond + sealed partial class Instance : ITGByond { /// /// The instance directory to store the BYOND installation @@ -72,7 +72,7 @@ namespace TGS.Server Thread RevisionStaging; /// - /// Called when the is setup. Prepares the BYOND updater + /// Called when the is setup. Prepares the BYOND updater /// void InitByond() { @@ -92,7 +92,7 @@ namespace TGS.Server } /// - /// Called when the is shutdown + /// Called when the is shutdown /// void DisposeByond() { @@ -194,7 +194,7 @@ namespace TGS.Server } /// - /// Downloads and unzips a BYOND revision. Calls afterwards if the isn't running, otherwise, calls . Sets on failure + /// Downloads and unzips a BYOND revision. Calls afterwards if the isn't running, otherwise, calls . Sets on failure /// /// Stringified BYOND revision public void UpdateToVersionImpl(object param) diff --git a/TGS.Server/ServerInstance/Chat.cs b/TGS.Server/Instance/Chat.cs similarity index 98% rename from TGS.Server/ServerInstance/Chat.cs rename to TGS.Server/Instance/Chat.cs index 396c15a5f2..6d1d426ddb 100644 --- a/TGS.Server/ServerInstance/Chat.cs +++ b/TGS.Server/Instance/Chat.cs @@ -9,7 +9,7 @@ using TGS.Interface.Components; namespace TGS.Server { - sealed partial class ServerInstance : ITGChat + sealed partial class Instance : ITGChat { /// /// Used for indicating unintialized encrypted data @@ -17,7 +17,7 @@ namespace TGS.Server public const string UninitializedString = "NEEDS INITIALIZING"; /// - /// List of s for the + /// List of s for the /// IList ChatProviders; /// @@ -26,7 +26,7 @@ namespace TGS.Server object ChatLock = new object(); /// - /// Set up the for the + /// Set up the for the /// public void InitChat() { diff --git a/TGS.Server/ServerInstance/Compiler.cs b/TGS.Server/Instance/Compiler.cs similarity index 99% rename from TGS.Server/ServerInstance/Compiler.cs rename to TGS.Server/Instance/Compiler.cs index d503e921ff..3ce9971504 100644 --- a/TGS.Server/ServerInstance/Compiler.cs +++ b/TGS.Server/Instance/Compiler.cs @@ -11,7 +11,7 @@ using TGS.Interface.Components; namespace TGS.Server { - sealed partial class ServerInstance : ITGCompiler + sealed partial class Instance : ITGCompiler { #region Win32 Shit [DllImport("kernel32.dll", SetLastError = true)] diff --git a/TGS.Server/ServerInstance/Config.cs b/TGS.Server/Instance/Config.cs similarity index 99% rename from TGS.Server/ServerInstance/Config.cs rename to TGS.Server/Instance/Config.cs index 41cad7cfe0..57968b54cd 100644 --- a/TGS.Server/ServerInstance/Config.cs +++ b/TGS.Server/Instance/Config.cs @@ -7,7 +7,7 @@ using TGS.Interface.Components; namespace TGS.Server { //knobs and such - sealed partial class ServerInstance : ITGConfig + sealed partial class Instance : ITGConfig { /// /// Used for multithreading safety diff --git a/TGS.Server/ServerInstance/DreamDaemon.cs b/TGS.Server/Instance/DreamDaemon.cs similarity index 99% rename from TGS.Server/ServerInstance/DreamDaemon.cs rename to TGS.Server/Instance/DreamDaemon.cs index 02290aa7e4..6983e2b585 100644 --- a/TGS.Server/ServerInstance/DreamDaemon.cs +++ b/TGS.Server/Instance/DreamDaemon.cs @@ -12,7 +12,7 @@ namespace TGS.Server { //manages the dd window. //It's not possible to actually click it while starting it in CL mode, so in order to change visibility, security, etc. It restarts the process when the world reboots - sealed partial class ServerInstance : ITGDreamDaemon + sealed partial class Instance : ITGDreamDaemon { enum ShutdownRequestPhase { @@ -519,9 +519,9 @@ namespace TGS.Server } /// - /// Copies from the program directory to the the directory + /// Copies from the program directory to the the directory /// - /// If , overwrites the 's current interface .dll if it exists + /// If , overwrites the 's current interface .dll if it exists void UpdateBridgeDll(bool overwrite) { var rbdlln = RelativePath(BridgeDLLName); diff --git a/TGS.Server/ServerInstance/ServerInstance.cs b/TGS.Server/Instance/Instance.cs similarity index 94% rename from TGS.Server/ServerInstance/ServerInstance.cs rename to TGS.Server/Instance/Instance.cs index 19eed58dc7..aaf98ef39a 100644 --- a/TGS.Server/ServerInstance/ServerInstance.cs +++ b/TGS.Server/Instance/Instance.cs @@ -15,7 +15,7 @@ namespace TGS.Server /// The class which holds all interface components. There are no safeguards for call race conditions so these must be guarded against internally /// [ServiceBehavior(ConcurrencyMode = ConcurrencyMode.Multiple, InstanceContextMode = InstanceContextMode.Single)] - sealed partial class ServerInstance : IDisposable, ITGConnectivity, ITGInstance + sealed partial class Instance : IDisposable, ITGConnectivity, ITGInstance { /// /// Used to assign the instance to event IDs @@ -26,9 +26,9 @@ namespace TGS.Server /// readonly IInstanceConfig Config; /// - /// Constructs and a + /// Constructs and a /// - public ServerInstance(IInstanceConfig config, byte logID) + public Instance(IInstanceConfig config, byte logID) { LoggingID = logID; Config = config; @@ -42,7 +42,7 @@ namespace TGS.Server } /// - /// Cleans up the + /// Cleans up the /// void RunDisposals() { @@ -96,7 +96,7 @@ namespace TGS.Server } /// - /// Converts relative paths to full directory paths + /// Converts relative paths to full directory paths /// /// string RelativePath(string path) diff --git a/TGS.Server/ServerInstance/Interop.cs b/TGS.Server/Instance/Interop.cs similarity index 99% rename from TGS.Server/ServerInstance/Interop.cs rename to TGS.Server/Instance/Interop.cs index 96d3f5a5d3..9365ba04fd 100644 --- a/TGS.Server/ServerInstance/Interop.cs +++ b/TGS.Server/Instance/Interop.cs @@ -13,7 +13,7 @@ using TGS.Interface.Components; namespace TGS.Server { //handles talking between the world and us - sealed partial class ServerInstance : ITGInterop + sealed partial class Instance : ITGInterop { object topicLock = new object(); diff --git a/TGS.Server/ServerInstance/PreactionHandler.cs b/TGS.Server/Instance/PreactionHandler.cs similarity index 98% rename from TGS.Server/ServerInstance/PreactionHandler.cs rename to TGS.Server/Instance/PreactionHandler.cs index 0026c4495e..8fc1d14792 100644 --- a/TGS.Server/ServerInstance/PreactionHandler.cs +++ b/TGS.Server/Instance/PreactionHandler.cs @@ -5,7 +5,7 @@ using System.IO; namespace TGS.Server { // Some useful functions for triggering pre action events - sealed partial class ServerInstance + sealed partial class Instance { /// /// The instance directory for Preaction handlers diff --git a/TGS.Server/ServerInstance/Repository.cs b/TGS.Server/Instance/Repository.cs similarity index 97% rename from TGS.Server/ServerInstance/Repository.cs rename to TGS.Server/Instance/Repository.cs index 339a7c592c..6c2486193d 100644 --- a/TGS.Server/ServerInstance/Repository.cs +++ b/TGS.Server/Instance/Repository.cs @@ -12,10 +12,10 @@ using TGS.Interface.Components; namespace TGS.Server { - sealed partial class ServerInstance : ITGRepository, IDisposable + sealed partial class Instance : ITGRepository, IDisposable { /// - /// The directory for the repository + /// The directory for the repository /// const string RepoPath = "Repository"; /// @@ -27,7 +27,7 @@ namespace TGS.Server /// const string RepoTGS3SettingsPath = RepoPath + "/TGS3.json"; /// - /// Path to the 's json + /// Path to the 's json /// const string CachedTGS3SettingsPath = "TGS3.json"; /// @@ -39,7 +39,7 @@ namespace TGS.Server /// const string SSHPushRemote = "ssh_push_target"; /// - /// The directory for the repository SSH keys + /// The directory for the repository SSH keys /// const string RepoKeyDir = "RepoKey/"; /// @@ -86,7 +86,7 @@ namespace TGS.Server int currentProgress = -1; /// - /// Used for automatically updating the + /// Used for automatically updating the /// System.Timers.Timer autoUpdateTimer = new System.Timers.Timer() { @@ -292,7 +292,7 @@ namespace TGS.Server } /// - /// Copies the Static directory to the first available Static_BACKUP path in the then deleted the old directory + /// Copies the Static directory to the first available Static_BACKUP path in the then deleted the old directory /// void BackupAndDeleteStaticDirectory() { @@ -769,7 +769,7 @@ namespace TGS.Server } /// - /// Lists tags in the repository created by the + /// Lists tags in the repository created by the /// /// on success, error message on failure /// A dictionary of tag title -> commit SHA on success, on failure @@ -826,7 +826,7 @@ namespace TGS.Server } /// - /// Deletes the 's + /// Deletes the 's /// void DeletePRList() { @@ -1193,9 +1193,9 @@ namespace TGS.Server } /// - /// Check if the is configured for SSH pushing + /// Check if the is configured for SSH pushing /// - /// if the see cref="ServerInstance"/> is configured for SSH pushing, otherwise + /// if the see cref="Instance"/> is configured for SSH pushing, otherwise bool SSHAuth() { return File.Exists(RelativePath(PrivateKeyPath)) && File.Exists(RelativePath(PublicKeyPath)); @@ -1365,7 +1365,7 @@ namespace TGS.Server } /// - /// Runs on the configured of and tries to and the + /// Runs on the configured of and tries to and the /// /// A /// The event arguments diff --git a/TGS.Server/InstanceConfig.cs b/TGS.Server/InstanceConfig.cs index 11d2469192..a961f295b8 100644 --- a/TGS.Server/InstanceConfig.cs +++ b/TGS.Server/InstanceConfig.cs @@ -5,12 +5,12 @@ using TGS.Interface; namespace TGS.Server { /// - /// Configuration settings for a + /// Configuration settings for a /// public interface IInstanceConfig { /// - /// The directory this is for + /// The directory this is for /// string Directory { get; } @@ -20,32 +20,32 @@ namespace TGS.Server ulong Version { get; } /// - /// The name of the + /// The name of the /// string Name { get; set; } /// - /// If the is active + /// If the is active /// bool Enabled { get; set; } /// - /// The name of the .dme/.dmb the uses + /// The name of the .dme/.dmb the uses /// string ProjectName { get; set; } /// - /// The port the runs on + /// The port the runs on /// ushort Port { get; set; } /// - /// The level for the + /// The level for the /// DreamDaemonSecurity Security { get; set; } /// - /// Whether or not the should immediately start DreamDaemon when activated + /// Whether or not the should immediately start DreamDaemon when activated /// bool Autostart { get; set; } @@ -74,7 +74,7 @@ namespace TGS.Server string ChatProviderEntropy { get; set; } /// - /// If the should reattach to a running DreamDaemon + /// If the should reattach to a running DreamDaemon /// bool ReattachRequired { get; set; } @@ -99,12 +99,12 @@ namespace TGS.Server string ReattachAPIVersion { get; set; } /// - /// The user group allowed to use the + /// The user group allowed to use the /// string AuthorizedUserGroupSID { get; set; } /// - /// The auto update interval for the + /// The auto update interval for the /// ulong AutoUpdateInterval { get; set; } @@ -114,7 +114,7 @@ namespace TGS.Server bool PushTestmergeCommits { get; set; } /// - /// Saves the to it's + /// Saves the to it's /// void Save(); } @@ -169,7 +169,7 @@ namespace TGS.Server public string CommitterEmail { get; set; } = "tgstation-server@tgstation13.org"; /// - public string ChatProviderData { get; set; } = ServerInstance.UninitializedString; + public string ChatProviderData { get; set; } = Instance.UninitializedString; /// public string ChatProviderEntropy { get; set; } @@ -199,9 +199,9 @@ namespace TGS.Server public bool PushTestmergeCommits { get; set; } = false; /// - /// Construct a for a at + /// Construct a for a at /// - /// The path to the + /// The path to the public InstanceConfig(string path) { Directory = path; @@ -216,9 +216,9 @@ namespace TGS.Server } /// - /// Loads and migrates an from a at + /// Loads and migrates an from a at /// - /// The path to the directory + /// The path to the directory /// The migrated public static IInstanceConfig Load(string path) { diff --git a/TGS.Server/RepoConfig.cs b/TGS.Server/RepoConfig.cs index 91a165171f..c998c131c4 100644 --- a/TGS.Server/RepoConfig.cs +++ b/TGS.Server/RepoConfig.cs @@ -7,7 +7,7 @@ using System.Web.Script.Serialization; namespace TGS.Server { /// - /// Repository specific information for a + /// Repository specific information for a /// sealed class RepoConfig : IEquatable { @@ -32,7 +32,7 @@ namespace TGS.Server /// public readonly IList PathsToStage = new List(); /// - /// Directory's whose contents should not be touched when the updates + /// Directory's whose contents should not be touched when the updates /// public readonly IList StaticDirectoryPaths = new List(); /// diff --git a/TGS.Server/Server.cs b/TGS.Server/Server.cs index 2f7351ce31..83980bef48 100644 --- a/TGS.Server/Server.cs +++ b/TGS.Server/Server.cs @@ -43,7 +43,7 @@ namespace TGS.Server /// /// Checks an for illegal characters /// - /// The name to check + /// The name to check /// if contains no illegal characters, error message otherwise static string CheckInstanceName(string instanceName) { @@ -59,11 +59,11 @@ namespace TGS.Server /// ServiceHost serviceHost; /// - /// Map of to the respective hosting the + /// Map of to the respective hosting the /// IDictionary hosts; /// - /// List of s in use + /// List of s in use /// IList UsedLoggingIDs = new List(); @@ -233,7 +233,7 @@ namespace TGS.Server } /// - /// Creates s for all s as listed in , detaches bad ones + /// Creates s for all s as listed in , detaches bad ones /// void SetupInstances() { @@ -257,9 +257,9 @@ namespace TGS.Server } /// - /// Unlocks a acquired with + /// Unlocks a acquired with /// - /// The to unlock + /// The to unlock void UnlockLoggingID(byte ID) { lock (UsedLoggingIDs) @@ -269,9 +269,9 @@ namespace TGS.Server } /// - /// Gets and locks a + /// Gets and locks a /// - /// A logging ID for the must be released using + /// A logging ID for the must be released using byte LockLoggingID() { lock (UsedLoggingIDs) @@ -287,19 +287,19 @@ namespace TGS.Server } /// - /// Creates and starts a for a at + /// Creates and starts a for a at /// - /// The for the + /// The for the /// The inactive on success, on failure ServiceHost SetupInstance(IInstanceConfig config) { - ServerInstance instance; + Instance instance; string instanceName; try { if (hosts.ContainsKey(config.Directory)) { - var datInstance = ((ServerInstance)hosts[config.Directory].SingletonInstance); + var datInstance = ((Instance)hosts[config.Directory].SingletonInstance); Logger.WriteError(String.Format("Unable to start instance at path {0}. Has the same name as instance at path {1}. Detaching...", config.Directory, datInstance.ServerDirectory()), EventID.InstanceInitializationFailure, LoggingID); return null; } @@ -308,7 +308,7 @@ namespace TGS.Server var ID = LockLoggingID(); Logger.WriteInfo(String.Format("Instance {0} ({1}) assigned logging ID {2}", config.Name, config.Directory, ID), EventID.InstanceIDAssigned, ID); instanceName = config.Name; - instance = new ServerInstance(config, ID); + instance = new Instance(config, ID); } catch (Exception e) { @@ -348,7 +348,7 @@ namespace TGS.Server } /// - /// Shuts down all active s and calls on it's + /// Shuts down all active s and calls on it's /// void OnStop() { @@ -359,7 +359,7 @@ namespace TGS.Server foreach (var I in hosts) { var host = I.Value; - var instance = (ServerInstance)host.SingletonInstance; + var instance = (Instance)host.SingletonInstance; host.Close(); instance.Dispose(); UnlockLoggingID(instance.LoggingID); @@ -381,7 +381,7 @@ namespace TGS.Server public void PrepareForUpdate() { foreach (var I in hosts) - ((ServerInstance)I.Value.SingletonInstance).Reattach(false); + ((Instance)I.Value.SingletonInstance).Reattach(false); } /// @@ -431,7 +431,7 @@ namespace TGS.Server Name = ic.Name, Path = ic.Directory, Enabled = ic.Enabled, - LoggingID = (byte)(ic.Enabled ? ((ServerInstance)hosts[ic.Name].SingletonInstance).LoggingID : 0) + LoggingID = (byte)(ic.Enabled ? ((Instance)hosts[ic.Name].SingletonInstance).LoggingID : 0) }); return result; } @@ -475,7 +475,7 @@ namespace TGS.Server /// /// Starts and onlines an instance located at /// - /// The for the + /// The for the /// on success, error message on failure string SetupOneInstance(IInstanceConfig config) { @@ -543,11 +543,11 @@ namespace TGS.Server /// - /// Sets a 's enabled status + /// Sets a 's enabled status /// - /// The whom's status should be changed - /// to enable the , to disable it - /// The path to the modified + /// The whom's status should be changed + /// to enable the , to disable it + /// The path to the modified /// on success, error message on failure string SetInstanceEnabledImpl(string Name, bool enabled, out string path) { @@ -575,7 +575,7 @@ namespace TGS.Server return null; var host = hosts[Name]; hosts.Remove(Name); - var inst = (ServerInstance)host.SingletonInstance; + var inst = (Instance)host.SingletonInstance; host.Close(); path = inst.ServerDirectory(); inst.Offline(); diff --git a/TGS.Server/TGS.Server.csproj b/TGS.Server/TGS.Server.csproj index 8841b1a5fa..ff1f370ebc 100644 --- a/TGS.Server/TGS.Server.csproj +++ b/TGS.Server/TGS.Server.csproj @@ -97,26 +97,26 @@ - - - + + + - - + + - + - + - - + + True True Settings.settings - +