From 455934a8088821dbb70540439dfb8c51ff2d5c40 Mon Sep 17 00:00:00 2001 From: Cyberboss Date: Thu, 9 Aug 2018 15:08:51 -0400 Subject: [PATCH] Remove old interop stuff --- src/DMAPI/tgs/v4/api.dm | 3 +-- src/Tgstation.Server.Host/Components/Watchdog/InteropInfo.cs | 2 -- .../Components/Watchdog/SessionControllerFactory.cs | 1 - src/Tgstation.Server.Host/Core/Application.cs | 3 --- src/Tgstation.Server.Host/Core/IApplication.cs | 5 ----- 5 files changed, 1 insertion(+), 13 deletions(-) diff --git a/src/DMAPI/tgs/v4/api.dm b/src/DMAPI/tgs/v4/api.dm index ca2da26236..141cee1fb3 100644 --- a/src/DMAPI/tgs/v4/api.dm +++ b/src/DMAPI/tgs/v4/api.dm @@ -29,7 +29,6 @@ /datum/tgs_api/v4 var/access_identifier var/instance_name - var/host_path var/json_path var/chat_channels_json_path var/chat_commands_json_path @@ -67,7 +66,6 @@ access_identifier = cached_json["accessIdentifier"] instance_name = text2num(cached_json["instanceName"]) - host_path = cached_json["hostPath"] if(cached_json["apiValidateOnly"]) TGS_INFO_LOG("Validating API and exiting...") Export(TGS4_COMM_VALIDATE) @@ -106,6 +104,7 @@ Export(TGS4_COMM_SERVER_PRIMED) var/tgs4_secret_sleep_offline_sauce = 24051994 var/old_sleep_offline = world.sleep_offline + world.sleep_offline = tgs4_secret_sleep_offline_sauce sleep(1) if(world.sleep_offline == tgs4_secret_sleep_offline_sauce) //if not someone changed it world.sleep_offline = old_sleep_offline diff --git a/src/Tgstation.Server.Host/Components/Watchdog/InteropInfo.cs b/src/Tgstation.Server.Host/Components/Watchdog/InteropInfo.cs index 02b8b94448..6ef2befdbb 100644 --- a/src/Tgstation.Server.Host/Components/Watchdog/InteropInfo.cs +++ b/src/Tgstation.Server.Host/Components/Watchdog/InteropInfo.cs @@ -6,8 +6,6 @@ namespace Tgstation.Server.Host.Components.Watchdog sealed class InteropInfo { public string AccessIdentifier { get; set; } - - public string HostPath { get; set; } public bool ApiValidateOnly { get; set; } diff --git a/src/Tgstation.Server.Host/Components/Watchdog/SessionControllerFactory.cs b/src/Tgstation.Server.Host/Components/Watchdog/SessionControllerFactory.cs index 578458f8ea..1f412ec361 100644 --- a/src/Tgstation.Server.Host/Components/Watchdog/SessionControllerFactory.cs +++ b/src/Tgstation.Server.Host/Components/Watchdog/SessionControllerFactory.cs @@ -116,7 +116,6 @@ namespace Tgstation.Server.Host.Components.Watchdog ChatChannelsJson = JsonFile("chat_channels"), ChatCommandsJson = JsonFile("chat_commands"), ServerCommandsJson = JsonFile("server_commands"), - HostPath = application.HostingPath, InstanceName = instance.Name, Revision = dmbProvider.CompileJob.RevisionInformation }; diff --git a/src/Tgstation.Server.Host/Core/Application.cs b/src/Tgstation.Server.Host/Core/Application.cs index 79b103979b..f5eb0b925d 100644 --- a/src/Tgstation.Server.Host/Core/Application.cs +++ b/src/Tgstation.Server.Host/Core/Application.cs @@ -40,9 +40,6 @@ namespace Tgstation.Server.Host.Core /// public string VersionPrefix => "tgstation-server"; - /// - public string HostingPath => serverAddresses.Addresses.First(); - /// public Version Version { get; } diff --git a/src/Tgstation.Server.Host/Core/IApplication.cs b/src/Tgstation.Server.Host/Core/IApplication.cs index e720c32c8f..acd348a8d9 100644 --- a/src/Tgstation.Server.Host/Core/IApplication.cs +++ b/src/Tgstation.Server.Host/Core/IApplication.cs @@ -22,11 +22,6 @@ namespace Tgstation.Server.Host.Core /// Version Version { get; } - /// - /// The url the server can be reached at locally - /// - string HostingPath { get; } - /// /// Mark the as ready to run ///