From ec78a4c748e43a586080c73345a034c990778ccc Mon Sep 17 00:00:00 2001 From: Lucas Nicodemus Date: Mon, 5 Dec 2011 22:56:03 -0700 Subject: [PATCH] Threaded the server stat tracking thingy. Rockin' Server! --- TShockAPI/Commands.cs | 14 ++++++++++++-- TShockAPI/TShock.cs | 11 +++++++---- 2 files changed, 19 insertions(+), 6 deletions(-) diff --git a/TShockAPI/Commands.cs b/TShockAPI/Commands.cs index fe4cb2f6..05a75e0a 100644 --- a/TShockAPI/Commands.cs +++ b/TShockAPI/Commands.cs @@ -192,6 +192,7 @@ namespace TShockAPI add(Permissions.grow, Grow, "grow"); add(Permissions.hardmode, StartHardMode, "hardmode"); add(Permissions.hardmode, DisableHardMode, "stophardmode", "disablehardmode"); + add(Permissions.cfg, ServerInfo, "stats"); } public static bool HandleCommand(TSPlayer player, string text) @@ -592,10 +593,19 @@ namespace TShockAPI } #endregion + #region Stupid commands + public static void ServerInfo(CommandArgs args) + { + args.Player.SendMessage("Memory usage: " + System.Diagnostics.Process.GetCurrentProcess().WorkingSet64); + args.Player.SendMessage("Allocated memory: " + System.Diagnostics.Process.GetCurrentProcess().VirtualMemorySize64); + args.Player.SendMessage("Threads: " + System.Diagnostics.Process.GetCurrentProcess().Threads.ToString()); + args.Player.SendMessage("Total processor time: " + System.Diagnostics.Process.GetCurrentProcess().TotalProcessorTime); + } + #endregion - #region Player Management Commands + #region Player Management Commands - private static void GrabUserUserInfo(CommandArgs args) + private static void GrabUserUserInfo(CommandArgs args) { if (args.Parameters.Count < 1) { diff --git a/TShockAPI/TShock.cs b/TShockAPI/TShock.cs index 196c7a12..45c97126 100644 --- a/TShockAPI/TShock.cs +++ b/TShockAPI/TShock.cs @@ -251,7 +251,9 @@ namespace TShockAPI try { string response = client.DownloadString("http://tshock.co/tickto.php?do=log&fp=" + fp + "&ver=" + VersionNum + "&port=" + Netplay.serverPort); - Console.WriteLine("Registered with stat tracker: " + response); + Console.ForegroundColor = ConsoleColor.Cyan; + Console.WriteLine("\nRegistered with stat tracker: " + response + "\n"); + Console.ForegroundColor = ConsoleColor.Gray; } catch (Exception e) { @@ -432,9 +434,10 @@ namespace TShockAPI Regions.ReloadAllRegions(); if (Config.RestApiEnabled) RestApi.Start(); - Console.ForegroundColor = ConsoleColor.Cyan; - callHome(); - Console.ForegroundColor = ConsoleColor.Gray; + + Thread t = new Thread(callHome); + t.Start(); + }