From fc1d188951771ac0f61da61342d3b52c1aa8433b Mon Sep 17 00:00:00 2001 From: White Date: Wed, 8 Apr 2015 20:46:12 +0930 Subject: [PATCH 1/3] DEBUG preprocessor checks for ILog --- TShockAPI/GetDataHandlers.cs | 4 ++++ TShockAPI/ILog.cs | 2 ++ TShockAPI/Log.cs | 4 +++- TShockAPI/SqlLog.cs | 2 ++ TShockAPI/TSPlayer.cs | 4 +++- TShockAPI/TextLog.cs | 2 ++ 6 files changed, 16 insertions(+), 2 deletions(-) diff --git a/TShockAPI/GetDataHandlers.cs b/TShockAPI/GetDataHandlers.cs index c746dbd1..8b0330b3 100755 --- a/TShockAPI/GetDataHandlers.cs +++ b/TShockAPI/GetDataHandlers.cs @@ -2469,7 +2469,9 @@ namespace TShockAPI { if (type == 100 || type == 164 || type == 180 || type == 261 || (type > 289 && type < 298) || (type >= 325 && type <= 328) || (type >= 345 && type <= 352)) { +#if DEBUG TShock.Log.Debug("Certain projectiles have been ignored for cheat detection."); +#endif } else { @@ -2496,7 +2498,9 @@ namespace TShockAPI { if (type == 90 && TShock.Config.ProjIgnoreShrapnel) // Ignore crystal shards { +#if DEBUG TShock.Log.Debug("Ignoring shrapnel per config.."); +#endif } else if (!Main.projectile[index].active) { diff --git a/TShockAPI/ILog.cs b/TShockAPI/ILog.cs index cae6755b..8da7284d 100644 --- a/TShockAPI/ILog.cs +++ b/TShockAPI/ILog.cs @@ -122,6 +122,7 @@ namespace TShockAPI /// LogLevel assosciated with the message void Write(string message, TraceLevel level); +#if DEBUG /// /// Writes a debug string to the log file. /// @@ -134,6 +135,7 @@ namespace TShockAPI /// The format of the message to be written. /// The format arguments. void Debug(string format, params object[] args); +#endif /// /// Dispose the Log diff --git a/TShockAPI/Log.cs b/TShockAPI/Log.cs index 93a2d0c1..85e611c7 100644 --- a/TShockAPI/Log.cs +++ b/TShockAPI/Log.cs @@ -154,7 +154,8 @@ namespace TShockAPI { ConsoleInfo(string.Format(format, args)); } - + +#if DEBUG /// /// Writes a debug string to the log file. /// @@ -175,6 +176,7 @@ namespace TShockAPI { Debug(string.Format(format, args)); } +#endif /// /// Internal method which writes a message directly to the log file. diff --git a/TShockAPI/SqlLog.cs b/TShockAPI/SqlLog.cs index ef0ceba7..4eb062cb 100644 --- a/TShockAPI/SqlLog.cs +++ b/TShockAPI/SqlLog.cs @@ -205,6 +205,7 @@ namespace TShockAPI ConsoleInfo(string.Format(format, args)); } +#if DEBUG /// /// Writes a debug string to the log file. /// @@ -223,6 +224,7 @@ namespace TShockAPI { Debug(string.Format(format, args)); } +#endif public void Write(string message, TraceLevel level) { diff --git a/TShockAPI/TSPlayer.cs b/TShockAPI/TSPlayer.cs index 2a6a9f49..397b8d09 100755 --- a/TShockAPI/TSPlayer.cs +++ b/TShockAPI/TSPlayer.cs @@ -849,7 +849,7 @@ namespace TShockAPI { if (displayConsole) { - TShock.Log.ConsoleInfo("Player {0} has been disabled for {1}.", Name, reason); + TShock.Log.ConsoleInfo("Player {0} has been disabled for {1}.", Name, reason); } else { @@ -858,11 +858,13 @@ namespace TShockAPI LastDisableNotification = DateTime.UtcNow; } } +#if DEBUG var trace = new StackTrace(); StackFrame frame = null; frame = trace.GetFrame(1); if (frame != null && frame.GetMethod().DeclaringType != null) TShock.Log.Debug(frame.GetMethod().DeclaringType.Name + " called Disable()."); +#endif } public virtual void Whoopie(object time) diff --git a/TShockAPI/TextLog.cs b/TShockAPI/TextLog.cs index aef72b7a..6d5fe143 100644 --- a/TShockAPI/TextLog.cs +++ b/TShockAPI/TextLog.cs @@ -172,6 +172,7 @@ namespace TShockAPI ConsoleInfo(string.Format(format, args)); } +#if DEBUG /// /// Writes a debug string to the log file. /// @@ -190,6 +191,7 @@ namespace TShockAPI { Debug(string.Format(format, args)); } +#endif /// /// Writes a message to the log From b4f2ddef47e34f6761a7afbe02fc4db455a79fcf Mon Sep 17 00:00:00 2001 From: White Date: Thu, 9 Apr 2015 15:56:51 +0930 Subject: [PATCH 2/3] DEBUG preprocessor conditional inside method --- TShockAPI/GetDataHandlers.cs | 4 ---- TShockAPI/ILog.cs | 6 ++---- TShockAPI/SqlLog.cs | 8 +++++--- TShockAPI/TSPlayer.cs | 2 -- TShockAPI/TextLog.cs | 6 ++++-- 5 files changed, 11 insertions(+), 15 deletions(-) diff --git a/TShockAPI/GetDataHandlers.cs b/TShockAPI/GetDataHandlers.cs index 8b0330b3..c746dbd1 100755 --- a/TShockAPI/GetDataHandlers.cs +++ b/TShockAPI/GetDataHandlers.cs @@ -2469,9 +2469,7 @@ namespace TShockAPI { if (type == 100 || type == 164 || type == 180 || type == 261 || (type > 289 && type < 298) || (type >= 325 && type <= 328) || (type >= 345 && type <= 352)) { -#if DEBUG TShock.Log.Debug("Certain projectiles have been ignored for cheat detection."); -#endif } else { @@ -2498,9 +2496,7 @@ namespace TShockAPI { if (type == 90 && TShock.Config.ProjIgnoreShrapnel) // Ignore crystal shards { -#if DEBUG TShock.Log.Debug("Ignoring shrapnel per config.."); -#endif } else if (!Main.projectile[index].active) { diff --git a/TShockAPI/ILog.cs b/TShockAPI/ILog.cs index 8da7284d..a2dff96f 100644 --- a/TShockAPI/ILog.cs +++ b/TShockAPI/ILog.cs @@ -122,20 +122,18 @@ namespace TShockAPI /// LogLevel assosciated with the message void Write(string message, TraceLevel level); -#if DEBUG /// - /// Writes a debug string to the log file. + /// Writes a debug string to the log file. Only works if the DEBUG preprocessor conditional is set. /// /// The message to be written. void Debug(string message); /// - /// Writes a debug string to the log file. + /// Writes a debug string to the log file. Only works if the DEBUG preprocessor conditional is set. /// /// The format of the message to be written. /// The format arguments. void Debug(string format, params object[] args); -#endif /// /// Dispose the Log diff --git a/TShockAPI/SqlLog.cs b/TShockAPI/SqlLog.cs index 4eb062cb..e1ebbf78 100644 --- a/TShockAPI/SqlLog.cs +++ b/TShockAPI/SqlLog.cs @@ -205,14 +205,15 @@ namespace TShockAPI ConsoleInfo(string.Format(format, args)); } -#if DEBUG /// /// Writes a debug string to the log file. /// /// The message to be written. public void Debug(string message) { - Write(message, TraceLevel.Verbose); +#if DEBUG + Write(message, TraceLevel.Verbose);\ +#endif } /// @@ -222,9 +223,10 @@ namespace TShockAPI /// The format arguments. public void Debug(string format, params object[] args) { +#if DEBUG Debug(string.Format(format, args)); - } #endif + } public void Write(string message, TraceLevel level) { diff --git a/TShockAPI/TSPlayer.cs b/TShockAPI/TSPlayer.cs index 397b8d09..80caaa18 100755 --- a/TShockAPI/TSPlayer.cs +++ b/TShockAPI/TSPlayer.cs @@ -858,13 +858,11 @@ namespace TShockAPI LastDisableNotification = DateTime.UtcNow; } } -#if DEBUG var trace = new StackTrace(); StackFrame frame = null; frame = trace.GetFrame(1); if (frame != null && frame.GetMethod().DeclaringType != null) TShock.Log.Debug(frame.GetMethod().DeclaringType.Name + " called Disable()."); -#endif } public virtual void Whoopie(object time) diff --git a/TShockAPI/TextLog.cs b/TShockAPI/TextLog.cs index 6d5fe143..464305ad 100644 --- a/TShockAPI/TextLog.cs +++ b/TShockAPI/TextLog.cs @@ -172,14 +172,15 @@ namespace TShockAPI ConsoleInfo(string.Format(format, args)); } -#if DEBUG /// /// Writes a debug string to the log file. /// /// The message to be written. public void Debug(string message) { +#if DEBUG Write(message, TraceLevel.Verbose); +#endif } /// @@ -189,9 +190,10 @@ namespace TShockAPI /// The format arguments. public void Debug(string format, params object[] args) { +#if DEBUG Debug(string.Format(format, args)); - } #endif + } /// /// Writes a message to the log From cf34aad594570dcf4498bbffbf15ffa88f92cb91 Mon Sep 17 00:00:00 2001 From: White Date: Thu, 9 Apr 2015 15:58:10 +0930 Subject: [PATCH 3/3] Remove the pesky '/' that got in there somehow --- TShockAPI/SqlLog.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/TShockAPI/SqlLog.cs b/TShockAPI/SqlLog.cs index e1ebbf78..083f76e7 100644 --- a/TShockAPI/SqlLog.cs +++ b/TShockAPI/SqlLog.cs @@ -212,7 +212,7 @@ namespace TShockAPI public void Debug(string message) { #if DEBUG - Write(message, TraceLevel.Verbose);\ + Write(message, TraceLevel.Verbose); #endif }