From ca412032e89939146a05cf708a4b9df93f74c4ac Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 12 Jul 2012 21:36:33 +0100
Subject: Put output for "show connections" command into standard table format.

Also moves into own method.
---
 OpenSim/Region/Application/OpenSim.cs | 35 ++++++++++++++++-------------------
 1 file changed, 16 insertions(+), 19 deletions(-)

(limited to 'OpenSim/Region')

diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs
index 56ad5c9..f3e4a2d 100644
--- a/OpenSim/Region/Application/OpenSim.cs
+++ b/OpenSim/Region/Application/OpenSim.cs
@@ -996,25 +996,7 @@ namespace OpenSim
                     break;
 
                 case "connections":
-                    System.Text.StringBuilder connections = new System.Text.StringBuilder("Connections:\n");
-                    m_sceneManager.ForEachScene(
-                        delegate(Scene scene) {
-                        scene.ForEachClient(
-                                delegate(IClientAPI client) {
-                            connections.AppendFormat(
-                                "{0}: {1} ({2}) from {3} on circuit {4}\n",
-                                scene.RegionInfo.RegionName,
-                                client.Name,
-                                client.AgentId,
-                                client.RemoteEndPoint,
-                                client.CircuitCode
-                            );
-                        }
-                        );
-                    }
-                    );
-
-                    MainConsole.Instance.Output(connections.ToString());
+                    HandleShowConnections();
                     break;
 
                 case "circuits":
@@ -1138,6 +1120,21 @@ namespace OpenSim
             }
         }
 
+        private void HandleShowConnections()
+        {
+            ConsoleDisplayTable cdt = new ConsoleDisplayTable();
+            cdt.AddColumn("Region", 20);
+            cdt.AddColumn("Avatar name", 25);
+            cdt.AddColumn("Remote endpoint", 23);
+            cdt.AddColumn("Circuit number", 14);
+
+            m_sceneManager.ForEachScene(
+                s => s.ForEachClient(
+                    c => cdt.AddRow(s.RegionInfo.RegionName, c.Name, c.RemoteEndPoint.ToString(), c.CircuitCode.ToString())));
+
+            MainConsole.Instance.Output(cdt.ToString());
+        }
+
         /// <summary>
         /// Use XML2 format to serialize data to a file
         /// </summary>
-- 
cgit v1.1