From 4c4379b50f22a40f6178e37259afc2689a0f2dd1 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 22 Nov 2012 04:50:09 +0000
Subject: Make "set log level" command available across all servers

---
 OpenSim/Framework/Servers/BaseOpenSimServer.cs | 31 --------------------------
 OpenSim/Framework/Servers/ServerBase.cs        | 31 ++++++++++++++++++++++++++
 2 files changed, 31 insertions(+), 31 deletions(-)

(limited to 'OpenSim/Framework')

diff --git a/OpenSim/Framework/Servers/BaseOpenSimServer.cs b/OpenSim/Framework/Servers/BaseOpenSimServer.cs
index 9560171..5e898ef 100644
--- a/OpenSim/Framework/Servers/BaseOpenSimServer.cs
+++ b/OpenSim/Framework/Servers/BaseOpenSimServer.cs
@@ -102,10 +102,6 @@ namespace OpenSim.Framework.Servers
                     "shutdown",
                     "Quit the application", HandleQuit);
 
-            m_console.Commands.AddCommand("General", false, "set log level",
-                    "set log level <level>",
-                    "Set the console logging level", HandleLogLevel);
-
             m_console.Commands.AddCommand("General", false, "show threads",
                     "show threads",
                     "Show thread status", HandleShow);
@@ -254,33 +250,6 @@ namespace OpenSim.Framework.Servers
             Shutdown();
         }
 
-        private void HandleLogLevel(string module, string[] cmd)
-        {
-            if (null == m_consoleAppender)
-            {
-                Notice("No appender named Console found (see the log4net config file for this executable)!");
-                return;
-            }
-      
-            if (cmd.Length > 3)
-            {
-                string rawLevel = cmd[3];
-                
-                ILoggerRepository repository = LogManager.GetRepository();
-                Level consoleLevel = repository.LevelMap[rawLevel];
-                
-                if (consoleLevel != null)
-                    m_consoleAppender.Threshold = consoleLevel;
-                else
-                    Notice(
-                        String.Format(
-                            "{0} is not a valid logging level.  Valid logging levels are ALL, DEBUG, INFO, WARN, ERROR, FATAL, OFF",
-                            rawLevel));
-            }
-
-            Notice(String.Format("Console log level is {0}", m_consoleAppender.Threshold));
-        }
-
         /// <summary>
         /// Show help information
         /// </summary>
diff --git a/OpenSim/Framework/Servers/ServerBase.cs b/OpenSim/Framework/Servers/ServerBase.cs
index 129b5fa..feffe6d 100644
--- a/OpenSim/Framework/Servers/ServerBase.cs
+++ b/OpenSim/Framework/Servers/ServerBase.cs
@@ -126,6 +126,10 @@ namespace OpenSim.Framework.Servers
 
             m_console.Commands.AddCommand(
                 "General", false, "show uptime", "show uptime", "Show server uptime", HandleShow);
+
+            m_console.Commands.AddCommand(
+                "General", false, "set log level", "set log level <level>", "Set the console logging level", 
+                HandleLogLevel);
         }
 
         public virtual void HandleShow(string module, string[] cmd)
@@ -148,6 +152,33 @@ namespace OpenSim.Framework.Servers
             }
         }
 
+        private void HandleLogLevel(string module, string[] cmd)
+        {
+            if (null == m_consoleAppender)
+            {
+                Notice("No appender named Console found (see the log4net config file for this executable)!");
+                return;
+            }
+      
+            if (cmd.Length > 3)
+            {
+                string rawLevel = cmd[3];
+                
+                ILoggerRepository repository = LogManager.GetRepository();
+                Level consoleLevel = repository.LevelMap[rawLevel];
+                
+                if (consoleLevel != null)
+                    m_consoleAppender.Threshold = consoleLevel;
+                else
+                    Notice(
+                        String.Format(
+                            "{0} is not a valid logging level.  Valid logging levels are ALL, DEBUG, INFO, WARN, ERROR, FATAL, OFF",
+                            rawLevel));
+            }
+
+            Notice(String.Format("Console log level is {0}", m_consoleAppender.Threshold));
+        }
+
         /// <summary>
         /// Return a report about the uptime of this server
         /// </summary>
-- 
cgit v1.1