Changeset 359 for binary-improvements/MapRendering

Timestamp:

Oct 29, 2019, 11:20:45 AM (5 years ago)

Author:

alloc

Message:

Removed unnecessary try-catch-blocks from commands (command handler catches exceptions anyway and provides more detailed output)

Location:

binary-improvements/MapRendering/Commands

Files:

• EnableOpenIDDebug.cs (modified) (1 diff)
• EnableRendering.cs (modified) (1 diff)
• ReloadWebPermissions.cs (modified) (1 diff)
• RenderMap.cs (modified) (1 diff)
• webstat.cs (modified) (1 diff)

binary-improvements/MapRendering/Commands/EnableOpenIDDebug.cs

@@ -14 +14 @@
 
                 public override void Execute (List<string> _params, CommandSenderInfo _senderInfo) {
-                        try {
-                                if (_params.Count != 1) {
-                                        SdtdConsole.Instance.Output ("Current state: " + OpenID.debugOpenId);
-                                        return;
-                                }
+                        if (_params.Count != 1) {
+                                SdtdConsole.Instance.Output ("Current state: " + OpenID.debugOpenId);
+                                return;
+                        }
 
-                                OpenID.debugOpenId = _params [0].Equals ("1");
-                                SdtdConsole.Instance.Output ("Set OpenID debugging to " + _params [0].Equals ("1"));
-                        } catch (Exception e) {
-                                Log.Out ("Error in EnableOpenIDDebug.Run: " + e);
-                        }
+                        OpenID.debugOpenId = _params [0].Equals ("1");
+                        SdtdConsole.Instance.Output ("Set OpenID debugging to " + _params [0].Equals ("1"));
                 }
         }

binary-improvements/MapRendering/Commands/EnableRendering.cs

@@ -13 +13 @@
 
                 public override void Execute (List<string> _params, CommandSenderInfo _senderInfo) {
-                        try {
-                                if (_params.Count != 1) {
-                                        SdtdConsole.Instance.Output ("Current state: " + MapRendering.MapRendering.renderingEnabled);
-                                        return;
-                                }
+                        if (_params.Count != 1) {
+                                SdtdConsole.Instance.Output ("Current state: " + MapRendering.MapRendering.renderingEnabled);
+                                return;
+                        }
 
-                                MapRendering.MapRendering.renderingEnabled = _params [0].Equals ("1");
-                                SdtdConsole.Instance.Output ("Set live map rendering to " + _params [0].Equals ("1"));
-                        } catch (Exception e) {
-                                Log.Out ("Error in EnableRendering.Run: " + e);
-                        }
+                        MapRendering.MapRendering.renderingEnabled = _params [0].Equals ("1");
+                        SdtdConsole.Instance.Output ("Set live map rendering to " + _params [0].Equals ("1"));
                 }
         }

binary-improvements/MapRendering/Commands/ReloadWebPermissions.cs

@@ -14 +14 @@
 
                 public override void Execute (List<string> _params, CommandSenderInfo _senderInfo) {
-                        try {
-                                WebPermissions.Instance.Load ();
-                                SdtdConsole.Instance.Output ("Web permissions file reloaded");
-                        } catch (Exception e) {
-                                Log.Out ("Error in ReloadWebPermissions.Run: " + e);
-                        }
+                        WebPermissions.Instance.Load ();
+                        SdtdConsole.Instance.Output ("Web permissions file reloaded");
                 }
         }

binary-improvements/MapRendering/Commands/RenderMap.cs

@@ -13 +13 @@
 
                 public override void Execute (List<string> _params, CommandSenderInfo _senderInfo) {
-                        try {
-                                MapRendering.MapRendering.Instance.RenderFullMap ();
+                        MapRendering.MapRendering.Instance.RenderFullMap ();
 
-                                SdtdConsole.Instance.Output ("Render map done");
-                        } catch (Exception e) {
-                                Log.Out ("Error in RenderMap.Run: " + e);
-                        }
+                        SdtdConsole.Instance.Output ("Render map done");
                 }
         }

binary-improvements/MapRendering/Commands/webstat.cs

@@ -14 +14 @@
 
                 public override void Execute (List<string> _params, CommandSenderInfo _senderInfo) {
-                        try {
-                                int curHandlers = Web.currentHandlers;
-                                int totalHandlers = Web.handlingCount;
-                                long totalTime = Web.totalHandlingTime;
-                                SdtdConsole.Instance.Output ("Current Web handlers: " + curHandlers + " - total: " + totalHandlers);
-                                SdtdConsole.Instance.Output (" - Total time: " + totalTime + " µs - average time: " +
-                                                             totalTime / totalHandlers + " µs");
+                        int curHandlers = Web.currentHandlers;
+                        int totalHandlers = Web.handlingCount;
+                        long totalTime = Web.totalHandlingTime;
+                        SdtdConsole.Instance.Output ("Current Web handlers: " + curHandlers + " - total: " + totalHandlers);
+                        SdtdConsole.Instance.Output (" - Total time: " + totalTime + " µs - average time: " +
+                                                     totalTime / totalHandlers + " µs");
 
-                                curHandlers = WebCommandResult.currentHandlers;
-                                totalHandlers = WebCommandResult.handlingCount;
-                                totalTime = WebCommandResult.totalHandlingTime;
-                                SdtdConsole.Instance.Output ("Current Web command handlers: " + curHandlers + " - total: " +
-                                                             totalHandlers);
-                                SdtdConsole.Instance.Output (" - Total time: " + totalTime + " µs" +
-                                                             (totalHandlers > 0
-                                                                     ? " - average time: " + totalTime / totalHandlers + " µs"
-                                                                     : ""));
-                        } catch (Exception e) {
-                                Log.Out ("Error in webstat.Run: " + e);
-                        }
+                        curHandlers = WebCommandResult.currentHandlers;
+                        totalHandlers = WebCommandResult.handlingCount;
+                        totalTime = WebCommandResult.totalHandlingTime;
+                        SdtdConsole.Instance.Output ("Current Web command handlers: " + curHandlers + " - total: " +
+                                                     totalHandlers);
+                        SdtdConsole.Instance.Output (" - Total time: " + totalTime + " µs" +
+                                                     (totalHandlers > 0
+                                                             ? " - average time: " + totalTime / totalHandlers + " µs"
+                                                             : ""));
                 }
         }