From 42e87a6582c5880caf7bdee49450e6f27ddf82bf Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 22 Nov 2012 04:57:45 +0000
Subject: Add "get log level" command - this returns the current server session
 console logging level.

This supersedes getting information by calling "set log level" without a 4th argument, which is confusing.
---
 OpenSim/Framework/Servers/ServerBase.cs | 50 ++++++++++++++++++++-------------
 1 file changed, 31 insertions(+), 19 deletions(-)

(limited to 'OpenSim/Framework/Servers/ServerBase.cs')

diff --git a/OpenSim/Framework/Servers/ServerBase.cs b/OpenSim/Framework/Servers/ServerBase.cs
index feffe6d..9973a2d 100644
--- a/OpenSim/Framework/Servers/ServerBase.cs
+++ b/OpenSim/Framework/Servers/ServerBase.cs
@@ -128,8 +128,12 @@ namespace OpenSim.Framework.Servers
                 "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);
+                "General", false, "get log level", "get log level", "Get the current console logging level", 
+                (mod, cmd) => ShowLogLevel());
+
+            m_console.Commands.AddCommand(
+                "General", false, "set log level", "set log level <level>", 
+                "Set the console logging level for this session.", HandleSetLogLevel);
         }
 
         public virtual void HandleShow(string module, string[] cmd)
@@ -152,30 +156,38 @@ namespace OpenSim.Framework.Servers
             }
         }
 
-        private void HandleLogLevel(string module, string[] cmd)
+        private void HandleSetLogLevel(string module, string[] cmd)
         {
-            if (null == m_consoleAppender)
+            if (cmd.Length != 4)
             {
-                Notice("No appender named Console found (see the log4net config file for this executable)!");
+                Notice("Usage: set log level <level>");
                 return;
             }
-      
-            if (cmd.Length > 3)
+
+            if (null == m_consoleAppender)
             {
-                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("No appender named Console found (see the log4net config file for this executable)!");
+                return;
             }
 
+            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));
+
+            ShowLogLevel();
+        }
+
+        private void ShowLogLevel()
+        {
             Notice(String.Format("Console log level is {0}", m_consoleAppender.Threshold));
         }
 
-- 
cgit v1.1