Remove the stat tracker
The stat tracker has been offline for the last several weeks/months and nobody has done anything to fix that. Because of that, GDPR, and the fact that we haven't used it, we're discarding it.
This commit is contained in:
Lucas Nicodemus
parent
7e22ce40e0
commit
3f58274ef4
4 changed files with 2 additions and 327 deletions
|
|
@ -80,6 +80,7 @@ This is the rolling changelog for TShock for Terraria. Use past tense when addin
|
|||
* `Utils.MaxChests()` is now `Utils.HasWorldReachedMaxChests()`. (@hakusaro)
|
||||
* `Utils.GetIPv4Address()` is now `Utils.GetIPv4AddressFromHostname()`. (@hakusaro)
|
||||
* Fixed the disappearing problem when placing tile entities. (@mistzzt)
|
||||
* Removed the stat tracking system. (@hakusaro)
|
||||
|
||||
## TShock 4.3.25
|
||||
* Fixed a critical exploit in the Terraria protocol that could cause massive unpreventable world corruption as well as a number of other problems. Thanks to @bartico6 for reporting. Fixed by the efforts of @QuiCM, @hakusaro, and tips in the right directioon from @bartico6.
|
||||
|
|
|
|||
|
|
@ -1,314 +0,0 @@
|
|||
/*
|
||||
TShock, a server mod for Terraria
|
||||
Copyright (C) 2011-2018 Pryaxis & TShock Contributors
|
||||
|
||||
This program is free software: you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation, either version 3 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
This program is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
using System;
|
||||
using System.Net;
|
||||
using System.Threading;
|
||||
using System.Web;
|
||||
using TerrariaApi.Server;
|
||||
using System.Diagnostics;
|
||||
using System.Linq;
|
||||
using System.Runtime.InteropServices;
|
||||
using System.Net.Http;
|
||||
using System.Threading.Tasks;
|
||||
using TShockAPI.Extensions;
|
||||
using System.IO;
|
||||
using System.Text.RegularExpressions;
|
||||
|
||||
namespace TShockAPI
|
||||
{
|
||||
/// <summary>
|
||||
/// StatTracker class for tracking various server metrics
|
||||
/// </summary>
|
||||
public class StatTracker
|
||||
{
|
||||
/// <summary>
|
||||
/// Calls the GetPhysicallyInstalledSystemMemory Windows API function, returning the amount of RAM installed on the host PC
|
||||
/// </summary>
|
||||
/// <param name="totalMemInKb">The amount of memory (in kilobytes) present on the host PC</param>
|
||||
/// <returns></returns>
|
||||
[DllImport("kernel32.dll")]
|
||||
[return: MarshalAs(UnmanagedType.Bool)]
|
||||
static extern bool GetPhysicallyInstalledSystemMemory(out long totalMemInKb);
|
||||
|
||||
/// <summary>
|
||||
/// A provider token set on the command line. Used by the stats server to group providers
|
||||
/// </summary>
|
||||
public string ProviderToken = "";
|
||||
/// <summary>
|
||||
/// Whether or not to opt out of stat tracking
|
||||
/// </summary>
|
||||
public bool OptOut = false;
|
||||
|
||||
private PluginItem[] plugins;
|
||||
|
||||
private long totalMem = 0;
|
||||
private string serverId = "";
|
||||
private HttpClient _client;
|
||||
private const string TrackerUrl = "http://stats.tshock.co/submit/{0}";
|
||||
|
||||
/// <summary>
|
||||
/// Creates a new instance of <see cref="StatTracker"/>
|
||||
/// </summary>
|
||||
public StatTracker()
|
||||
{
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Starts the stat tracker
|
||||
/// </summary>
|
||||
public void Start()
|
||||
{
|
||||
if (OptOut)
|
||||
{
|
||||
//If opting out, return and do not start stat tracking
|
||||
return;
|
||||
}
|
||||
|
||||
//HttpClient with a 5 second timeout
|
||||
_client = new HttpClient()
|
||||
{
|
||||
Timeout = new TimeSpan(0, 0, 5)
|
||||
};
|
||||
serverId = Guid.NewGuid().ToString();
|
||||
|
||||
Thread t = new Thread(async () =>
|
||||
{
|
||||
do
|
||||
{
|
||||
//Wait 5 minutes
|
||||
await Task.Delay(1000 * 60 * 5);
|
||||
//Then update again
|
||||
await SendUpdateAsync();
|
||||
} while (true);
|
||||
})
|
||||
{
|
||||
Name = "TShock Stat Tracker Thread",
|
||||
IsBackground = true
|
||||
};
|
||||
t.Start();
|
||||
}
|
||||
|
||||
private async Task SendUpdateAsync()
|
||||
{
|
||||
JsonData data = PrepareJsonData();
|
||||
var serialized = Newtonsoft.Json.JsonConvert.SerializeObject(data);
|
||||
var encoded = HttpUtility.UrlEncode(serialized);
|
||||
var uri = string.Format(TrackerUrl, encoded);
|
||||
try
|
||||
{
|
||||
HttpResponseMessage msg = await _client.GetAsync(uri);
|
||||
if (msg.StatusCode != HttpStatusCode.OK)
|
||||
{
|
||||
string reason = msg.ReasonPhrase;
|
||||
if (string.IsNullOrWhiteSpace(reason))
|
||||
{
|
||||
reason = "none";
|
||||
}
|
||||
throw new WebException("Stats server did not respond with an OK. "
|
||||
+ $"Server message: [error {msg.StatusCode}] {reason}");
|
||||
}
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
string msg = ex.BuildExceptionString();
|
||||
|
||||
//Give the console a brief
|
||||
Console.ForegroundColor = ConsoleColor.Yellow;
|
||||
Console.WriteLine($"StatTracker warning: {msg}");
|
||||
Console.ForegroundColor = ConsoleColor.Gray;
|
||||
|
||||
//And log the full exception
|
||||
TShock.Log.Warn($"StatTracker warning: {ex.ToString()}");
|
||||
TShock.Log.ConsoleError("Retrying in 5 minutes.");
|
||||
}
|
||||
}
|
||||
|
||||
private JsonData PrepareJsonData()
|
||||
{
|
||||
return new JsonData()
|
||||
{
|
||||
port = Terraria.Netplay.ListenPort,
|
||||
currentPlayers = TShock.Utils.GetActivePlayerCount(),
|
||||
maxPlayers = TShock.Config.MaxSlots,
|
||||
systemRam = GetTotalSystemRam(ServerApi.RunningMono),
|
||||
version = TShock.VersionNum.ToString(),
|
||||
terrariaVersion = Terraria.Main.versionNumber2,
|
||||
providerId = ProviderToken,
|
||||
serverId = serverId,
|
||||
mono = ServerApi.RunningMono,
|
||||
ignorePluginVersion = ServerApi.IgnoreVersion,
|
||||
loadedPlugins = GetLoadedPlugins()
|
||||
};
|
||||
}
|
||||
|
||||
private PluginItem[] GetLoadedPlugins()
|
||||
{
|
||||
if (plugins != null)
|
||||
{
|
||||
return plugins; //Return early
|
||||
}
|
||||
|
||||
plugins = new PluginItem[ServerApi.Plugins.Count]; //Initialize with enough room to store the ammount of plugins loaded.
|
||||
for (var i = 0; i < ServerApi.Plugins.Count; i++)
|
||||
{
|
||||
var pluginItem = new PluginItem();
|
||||
var apiAttribute = (ApiVersionAttribute)ServerApi.Plugins[i].Plugin.GetType().GetCustomAttributes(typeof(ApiVersionAttribute), false).FirstOrDefault();
|
||||
//The current implementation of loading plugins doesn't allow for a plugin to be loaded without an ApiVersion, the UNKNOWN is there incase a change is made to allow it
|
||||
pluginItem.apiVersion = apiAttribute?.ApiVersion.ToString() ?? "UNKNOWN";
|
||||
pluginItem.name = ServerApi.Plugins[i].Plugin.Name;
|
||||
pluginItem.version = ServerApi.Plugins[i].Plugin.Version.ToString();
|
||||
plugins[i] = pluginItem;
|
||||
}
|
||||
return plugins;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Returns the amount of free RAM, in megabytes.
|
||||
/// </summary>
|
||||
/// <param name="mono">Whether or not this program is being executed in a Mono runtime</param>
|
||||
/// <returns>Free RAM memory amount, in megabytes</returns>
|
||||
public long GetFreeSystemRam(bool mono)
|
||||
{
|
||||
if (mono)
|
||||
{
|
||||
//Temporary in case mono won't work
|
||||
if (File.Exists("/proc/meminfo"))
|
||||
{
|
||||
var l = File.ReadAllLines("/proc/meminfo");
|
||||
foreach (string s in l)
|
||||
{
|
||||
if (s.StartsWith("MemFree:"))
|
||||
{
|
||||
var m = Regex.Match(s, "MemFree:(\\s*)(\\d*) kB");
|
||||
if (m.Success)
|
||||
{
|
||||
long val;
|
||||
if (long.TryParse(m.Groups[2].Value, out val))
|
||||
{
|
||||
return val / 1024;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
return -1;
|
||||
}
|
||||
else
|
||||
{
|
||||
var pc = new PerformanceCounter("Memory", "Available MBytes");
|
||||
return pc.RawValue;
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Returns the total amount of installed RAM, in gigabytes.
|
||||
/// </summary>
|
||||
/// <param name="isMono">Whether or not this program is being executed in a Mono runtime</param>
|
||||
/// <returns>Total RAM memory amount, in gigabytes</returns>
|
||||
public long GetTotalSystemRam(bool isMono)
|
||||
{
|
||||
if (totalMem != 0)
|
||||
{
|
||||
return totalMem; //Return early
|
||||
}
|
||||
|
||||
if (isMono) //Set totalMem so it can be returned later
|
||||
{
|
||||
var pc = new PerformanceCounter("Mono Memory", "Total Physical Memory");
|
||||
totalMem = (pc.RawValue / 1024 / 1024 / 1024);
|
||||
}
|
||||
else
|
||||
{
|
||||
GetPhysicallyInstalledSystemMemory(out totalMem);
|
||||
totalMem = (totalMem / 1024 / 1024); // Super hardcore maths to convert to Gb from Kb
|
||||
}
|
||||
|
||||
return totalMem;
|
||||
}
|
||||
}
|
||||
/// <summary>
|
||||
/// Holding information regarding loaded plugins
|
||||
/// </summary>
|
||||
public struct PluginItem
|
||||
{
|
||||
/// <summary>
|
||||
/// Plugin name
|
||||
/// </summary>
|
||||
public string name;
|
||||
/// <summary>
|
||||
/// Assembly version
|
||||
/// </summary>
|
||||
public string version;
|
||||
/// <summary>
|
||||
/// Api version or UNKNOWN if attribute is missing, which is currently impossible
|
||||
/// </summary>
|
||||
public string apiVersion;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Contains JSON-Serializable information about a server
|
||||
/// </summary>
|
||||
public struct JsonData
|
||||
{
|
||||
/// <summary>
|
||||
/// The port the server is running on
|
||||
/// </summary>
|
||||
public int port;
|
||||
/// <summary>
|
||||
/// The number of players currently on the server
|
||||
/// </summary>
|
||||
public int currentPlayers;
|
||||
/// <summary>
|
||||
/// The maximum number of player slots available on the server
|
||||
/// </summary>
|
||||
public int maxPlayers;
|
||||
/// <summary>
|
||||
/// The amount of RAM installed on the server's host PC
|
||||
/// </summary>
|
||||
public long systemRam;
|
||||
/// <summary>
|
||||
/// The TShock version being used by the server
|
||||
/// </summary>
|
||||
public string version;
|
||||
/// <summary>
|
||||
/// Whether or not server was started with --ignoreversion
|
||||
/// </summary>
|
||||
public bool ignorePluginVersion;
|
||||
/// <summary>
|
||||
/// List of loaded plugins and version name:
|
||||
/// </summary>
|
||||
public PluginItem[] loadedPlugins;
|
||||
/// <summary>
|
||||
/// The Terraria version supported by the server
|
||||
/// </summary>
|
||||
public string terrariaVersion;
|
||||
/// <summary>
|
||||
/// The provider ID set for the server
|
||||
/// </summary>
|
||||
public string providerId;
|
||||
/// <summary>
|
||||
/// The server ID set for the server
|
||||
/// </summary>
|
||||
public string serverId;
|
||||
/// <summary>
|
||||
/// Whether or not the server is running with Mono
|
||||
/// </summary>
|
||||
public bool mono;
|
||||
}
|
||||
}
|
||||
|
|
@ -116,8 +116,6 @@ namespace TShockAPI
|
|||
public static RestManager RestManager;
|
||||
/// <summary>Utils - Static reference to the utilities class, which contains a variety of utility functions.</summary>
|
||||
public static Utils Utils = Utils.Instance;
|
||||
/// <summary>StatTracker - Static reference to the stat tracker, which sends some server metrics every 5 minutes.</summary>
|
||||
public static StatTracker StatTracker = new StatTracker();
|
||||
/// <summary>UpdateManager - Static reference to the update checker, which checks for updates and notifies server admins of updates.</summary>
|
||||
public static UpdateManager UpdateManager;
|
||||
/// <summary>Log - Static reference to the log system, which outputs to either SQL or a text file, depending on user config.</summary>
|
||||
|
|
@ -328,12 +326,6 @@ namespace TShockAPI
|
|||
|
||||
Log.ConsoleInfo("TShock {0} ({1}) now running.", Version, VersionCodename);
|
||||
|
||||
var systemRam = StatTracker.GetFreeSystemRam(ServerApi.RunningMono);
|
||||
if (systemRam > -1 && systemRam < 2048)
|
||||
{
|
||||
Log.ConsoleError("This machine has less than 2 gigabytes of RAM free. Be advised that it might not be enough to run TShock.");
|
||||
}
|
||||
|
||||
ServerApi.Hooks.GamePostInitialize.Register(this, OnPostInit);
|
||||
ServerApi.Hooks.GameUpdate.Register(this, OnUpdate);
|
||||
ServerApi.Hooks.GameHardmodeTileUpdate.Register(this, OnHardUpdate);
|
||||
|
|
@ -757,13 +749,11 @@ namespace TShockAPI
|
|||
}
|
||||
})
|
||||
|
||||
.AddFlag("--provider-token", (token) => StatTracker.ProviderToken = token)
|
||||
|
||||
//Flags without arguments
|
||||
.AddFlag("-logclear", () => LogClear = true)
|
||||
.AddFlag("-autoshutdown", () => Main.instance.EnableAutoShutdown())
|
||||
.AddFlag("-dump", () => Utils.Dump())
|
||||
.AddFlag("--stats-optout", () => StatTracker.OptOut = true);
|
||||
.AddFlag("-dump", () => Utils.Dump());
|
||||
|
||||
CliParser.ParseFromSource(parms);
|
||||
}
|
||||
|
|
@ -896,7 +886,6 @@ namespace TShockAPI
|
|||
}
|
||||
|
||||
UpdateManager = new UpdateManager();
|
||||
StatTracker.Start();
|
||||
}
|
||||
|
||||
/// <summary>LastCheck - Used to keep track of the last check for basically all time based checks.</summary>
|
||||
|
|
|
|||
|
|
@ -144,7 +144,6 @@
|
|||
<Compile Include="Rest\RestVerbs.cs" />
|
||||
<Compile Include="Rest\SecureRest.cs" />
|
||||
<Compile Include="ServerSideCharacters\ServerSideConfig.cs" />
|
||||
<Compile Include="StatTracker.cs" />
|
||||
<Compile Include="TSServerPlayer.cs" />
|
||||
<Compile Include="Utils.cs" />
|
||||
<Compile Include="TShock.cs" />
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue