Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Fix some logging issues.

  • Loading branch information...
commit 0cd7eff90132ea4874a6e58a0178478e70736448 1 parent 904b66f
@RevolutionSmythe RevolutionSmythe authored
View
4 Aurora/Framework/ConsoleFramework/CommandConsole.cs
@@ -236,7 +236,7 @@ public string[] ExecuteCommand(string[] commandPath)
foreach (string s in help)
{
- MainConsole.Instance.Format(Level.All, s);
+ MainConsole.Instance.Format(Level.Off, s);
}
return new string[0];
}
@@ -509,7 +509,7 @@ public void Help(string[] cmd)
List<string> help = m_Commands.GetHelp(cmd);
foreach (string s in help)
- Output(s, Level.All);
+ Output(s, Level.Off);
}
/// <summary>
View
2  Aurora/Framework/ConsoleFramework/GUIConsole.cs
@@ -69,7 +69,7 @@ public void Help(string[] cmd)
List<string> help = m_Commands.GetHelp(cmd);
foreach (string s in help)
- Output(s, Level.All);
+ Output(s, Level.Off);
}
/// <summary>
View
4 Aurora/Framework/Modules/ICommandConsole.cs
@@ -169,13 +169,13 @@ public interface ICommandConsole
public enum Level
{
- Off = 0,
+ All = 0,
Trace = 1,
Debug = 2,
Info = 3,
Warn = 4,
Error = 5,
Fatal = 6,
- All = 7
+ Off = 7
}
}
View
3  Aurora/Modules/World/Startup/SimulationData/FileBasedSimulationData.cs
@@ -30,6 +30,7 @@
using Aurora.Framework.Modules;
using Aurora.Framework.SceneInfo;
using Aurora.Framework.SceneInfo.Entities;
+using Aurora.Framework.Servers;
using Aurora.Framework.Utilities;
using Aurora.Region;
using Nini.Config;
@@ -140,7 +141,7 @@ private RegionInfo CreateRegionFromConsole(RegionInfo info)
info.RegionSizeY = int.Parse(MainConsole.Instance.Prompt("Region size Y: ", info.RegionSizeY.ToString()));
if (info.InternalEndPoint == null)
- info.InternalEndPoint = new System.Net.IPEndPoint(System.Net.IPAddress.Parse("0.0.0.0"), 9000);
+ info.InternalEndPoint = new System.Net.IPEndPoint(System.Net.IPAddress.Parse("0.0.0.0"), (int)MainServer.Instance.Port);
System.Net.IPAddress intAdd =
System.Net.IPAddress.Parse(MainConsole.Instance.Prompt("Internal IP: ",
info.InternalEndPoint.Address.ToString()));
View
4 Aurora/Modules/World/WorldShader/WorldShader.cs
@@ -67,7 +67,7 @@ public void RevertShadeWorld(string[] cmd)
{
if (MainConsole.Instance.ConsoleScene == null)
{
- MainConsole.Instance.Format(Level.All, "Select a scene first");
+ MainConsole.Instance.Format(Level.Off, "Select a scene first");
return;
}
ISceneEntity[] entities = MainConsole.Instance.ConsoleScene.Entities.GetEntities();
@@ -95,7 +95,7 @@ public void ShadeWorld(string[] cmd)
{
if (MainConsole.Instance.ConsoleScene == null)
{
- MainConsole.Instance.Format(Level.All, "Select a scene first");
+ MainConsole.Instance.Format(Level.Off, "Select a scene first");
return;
}
bool greyScale = MainConsole.Instance.Prompt("Greyscale (yes or no)?").ToLower() == "yes";
View
4 Aurora/Physics/AuroraOpenDynamicsEngine/AODEApi.cs
@@ -1968,7 +1968,7 @@ static d()
}
catch (Exception ex)
{
- MainConsole.Instance.Format(Level.All, "[ODE]: Failed to copy ODE dll file, may have issues with physics! (Can be caused by running multiple instances in the same bin, if so, ignore this warning) " +
+ MainConsole.Instance.Format(Level.Off, "[ODE]: Failed to copy ODE dll file, may have issues with physics! (Can be caused by running multiple instances in the same bin, if so, ignore this warning) " +
ex.ToString());
}
try
@@ -1978,7 +1978,7 @@ static d()
}
catch (Exception ex)
{
- MainConsole.Instance.Format(Level.All, "[ODE]: Failed to copy ODE dll file, may have issues with physics! (Can be caused by running multiple instances in the same bin, if so, ignore this warning) " +
+ MainConsole.Instance.Format(Level.Off, "[ODE]: Failed to copy ODE dll file, may have issues with physics! (Can be caused by running multiple instances in the same bin, if so, ignore this warning) " +
ex.ToString());
}
}
View
2  Aurora/Services/GenericServices/NotificationService/BaseService.cs
@@ -116,7 +116,7 @@ private void HandleLogLevel(string[] cmd)
MainConsole.Instance.Threshold = (Level)Enum.Parse(typeof(Level), rawLevel, true);
- MainConsole.Instance.Format(Level.All, "Console log level is {0}", MainConsole.Instance.Threshold);
+ MainConsole.Instance.Format(Level.Off, "Console log level is {0}", MainConsole.Instance.Threshold);
}
#endregion
View
4 Aurora/Services/SQLServices/AvatarService/AvatarService.cs
@@ -200,7 +200,7 @@ public void ResetAvatarAppearance(string[] cmd)
UserAccount acc = m_registry.RequestModuleInterface<IUserAccountService>().GetUserAccount(null, name);
if (acc == null)
{
- MainConsole.Instance.Format(Level.All, "No known avatar with that name.");
+ MainConsole.Instance.Format(Level.Off, "No known avatar with that name.");
return;
}
ResetAvatar(acc.PrincipalID);
@@ -209,7 +209,7 @@ public void ResetAvatarAppearance(string[] cmd)
if (folder != null)
m_invService.ForcePurgeFolder(folder);
- MainConsole.Instance.Format(Level.All, "Reset avatar's appearance successfully.");
+ MainConsole.Instance.Format(Level.Off, "Reset avatar's appearance successfully.");
}
#endregion
View
2  Aurora/Services/SQLServices/UserAccountService/UserAccountService.cs
@@ -493,7 +493,7 @@ protected void HandleShowAccount(string[] cmdparams)
{
if (cmdparams.Length != 4)
{
- MainConsole.Instance.Format(Level.All, "Usage: show account <first-name> <last-name>");
+ MainConsole.Instance.Format(Level.Off, "Usage: show account <first-name> <last-name>");
return;
}
View
3  Documentation/BUILDING.txt
@@ -30,10 +30,7 @@ From the distribution type:
* ./runprebuild.sh
* xbuild Aurora.sln
* cd bin
-=== If your Mono version >= 2.8 ===
* run mono Aurora.exe --gc=sgen
-=== If your Mono version < 2.8 ===
- * run mono Aurora.exe
=== References ===
Please sign in to comment.
Something went wrong with that request. Please try again.