OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* Fixed a whole bunch of console messages.

afrisby
Adam Frisby 2007-12-04 10:13:13 +00:00
parent 3ff3e9ea28
commit 91c1e8a734
20 changed files with 54 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
OpenSim/Framework/ConfigurationMember.cs
View File

@ -147,19 +147,19 @@ namespace OpenSim.Framework
return;
}
MainLog.Instance.Verbose("Calling Configuration Load Function...");
MainLog.Instance.Verbose("CONFIG", "Calling Configuration Load Function...");
this.loadFunction();
if(configurationOptions.Count <= 0)
{
MainLog.Instance.Error("No configuration options were specified for '" + this.configurationOptions + "'. Refusing to continue configuration.");
MainLog.Instance.Error("CONFIG", "No configuration options were specified for '" + this.configurationOptions + "'. Refusing to continue configuration.");
return;
}
bool useFile = true;
if (configurationPlugin == null)
{
MainLog.Instance.Error("Configuration Plugin NOT LOADED!");
MainLog.Instance.Error("CONFIG", "Configuration Plugin NOT LOADED!");
return;
}

4
OpenSim/Framework/Data.MySQL/MySQLDataStore.cs
View File

@ -183,10 +183,10 @@ namespace OpenSim.Framework.Data.MySQL
catch (Exception e)
{
MainLog.Instance.Error("DATASTORE", "Failed create prim object, exception and data follows");
MainLog.Instance.Verbose(e.ToString());
MainLog.Instance.Verbose("DATASTORE", e.ToString());
foreach (DataColumn col in prims.Columns)
{
MainLog.Instance.Verbose("Col: " + col.ColumnName + " => " + primRow[col]);
MainLog.Instance.Verbose("DATASTORE", "Col: " + col.ColumnName + " => " + primRow[col]);
}
}
}

2
OpenSim/Framework/Data.MySQL/MySQLManager.cs
View File

@ -71,7 +71,7 @@ namespace OpenSim.Framework.Data.MySQL
dbcon.Open();
MainLog.Instance.Verbose("MySQL connection established");
MainLog.Instance.Verbose("MYSQL", "Connection established");
}
catch (Exception e)
{

18
OpenSim/Grid/GridServer/GridManager.cs
View File

@ -52,10 +52,10 @@ namespace OpenSim.Grid.GridServer
/// <param name="FileName">The filename to the grid server plugin DLL</param>
public void AddPlugin(string FileName)
{
MainLog.Instance.Verbose("Storage: Attempting to load " + FileName);
MainLog.Instance.Verbose("DATA", "Attempting to load " + FileName);
Assembly pluginAssembly = Assembly.LoadFrom(FileName);
MainLog.Instance.Verbose("Storage: Found " + pluginAssembly.GetTypes().Length + " interfaces.");
MainLog.Instance.Verbose("DATA", "Found " + pluginAssembly.GetTypes().Length + " interfaces.");
foreach (Type pluginType in pluginAssembly.GetTypes())
{
if (!pluginType.IsAbstract)
@ -69,7 +69,7 @@ namespace OpenSim.Grid.GridServer
(IGridData) Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString()));
plug.Initialise();
_plugins.Add(plug.getName(), plug);
MainLog.Instance.Verbose("Storage: Added IGridData Interface");
MainLog.Instance.Verbose("DATA", "Added IGridData Interface");
}
typeInterface = null;
@ -83,7 +83,7 @@ namespace OpenSim.Grid.GridServer
(ILogData) Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString()));
plug.Initialise();
_logplugins.Add(plug.getName(), plug);
MainLog.Instance.Verbose("Storage: Added ILogData Interface");
MainLog.Instance.Verbose("DATA", "Added ILogData Interface");
}
typeInterface = null;
@ -469,7 +469,7 @@ namespace OpenSim.Grid.GridServer
{
ymax = (Int32) requestData["ymax"];
}
MainLog.Instance.Verbose("World map request for range (" + xmin + "," + ymin + ")..(" + xmax + "," + ymax + ")");
MainLog.Instance.Verbose("MAP", "World map request for range (" + xmin + "," + ymin + ")..(" + xmax + "," + ymax + ")");
XmlRpcResponse response = new XmlRpcResponse();
Hashtable responseData = new Hashtable();
@ -507,7 +507,7 @@ namespace OpenSim.Grid.GridServer
simProfileList.Add(simProfileBlock);
}
MainLog.Instance.Verbose("World map request processed, returned " + simProfileList.Count.ToString() +
MainLog.Instance.Verbose("MAP", "World map request processed, returned " + simProfileList.Count.ToString() +
" region(s) in range via FastMode");
}
else
@ -542,7 +542,7 @@ namespace OpenSim.Grid.GridServer
}
}
}
MainLog.Instance.Verbose("World map request processed, returned " + simProfileList.Count.ToString() +
MainLog.Instance.Verbose("MAP", "World map request processed, returned " + simProfileList.Count.ToString() +
" region(s) in range via Standard Mode");
}
@ -708,7 +708,7 @@ namespace OpenSim.Grid.GridServer
try
{
MainLog.Instance.Verbose("Updating / adding via " + _plugins.Count + " storage provider(s) registered.");
MainLog.Instance.Verbose("DATA", "Updating / adding via " + _plugins.Count + " storage provider(s) registered.");
foreach (KeyValuePair<string, IGridData> kvp in _plugins)
{
try
@ -734,7 +734,7 @@ namespace OpenSim.Grid.GridServer
}
catch (Exception e)
{
MainLog.Instance.Verbose("getRegionPlugin Handle " + kvp.Key + " unable to add new sim: " +
MainLog.Instance.Warn("GRID", "getRegionPlugin Handle " + kvp.Key + " unable to add new sim: " +
e.ToString());
}
}

6
OpenSim/Grid/GridServer/Main.cs
View File

@ -106,12 +106,12 @@ namespace OpenSim.Grid.GridServer
//Yeah srsly, that's it.
if (setuponly) Environment.Exit(0);
m_console.Verbose("Main.cs:Startup() - Connecting to Storage Server");
m_console.Verbose("GRID", "Connecting to Storage Server");
m_gridManager = new GridManager();
m_gridManager.AddPlugin(Cfg.DatabaseProvider); // Made of win
m_gridManager.config = Cfg;
m_console.Verbose("Main.cs:Startup() - Starting HTTP process");
m_console.Verbose("GRID", "Starting HTTP process");
BaseHttpServer httpServer = new BaseHttpServer((int) Cfg.HttpPort);
//GridManagementAgent GridManagerAgent = new GridManagementAgent(httpServer, "gridserver", Cfg.SimSendKey, Cfg.SimRecvKey, managercallback);
@ -132,7 +132,7 @@ namespace OpenSim.Grid.GridServer
httpServer.Start();
m_console.Verbose("Main.cs:Startup() - Starting sim status checker");
m_console.Verbose("GRID", "Starting sim status checker");
Timer simCheckTimer = new Timer(3600000*3); // 3 Hours between updates.
simCheckTimer.Elapsed += new ElapsedEventHandler(CheckSims);

4
OpenSim/Grid/UserServer/Main.cs
View File

@ -84,14 +84,14 @@ namespace OpenSim.Grid.UserServer
{
Cfg = new UserConfig("USER SERVER", (Path.Combine(Util.configDir(), "UserServer_Config.xml")));
MainLog.Instance.Verbose("Main.cs:Startup() - Establishing data connection");
MainLog.Instance.Verbose("REGION", "Establishing data connection");
m_userManager = new UserManager();
m_userManager._config = Cfg;
m_userManager.AddPlugin(Cfg.DatabaseProvider);
m_loginService = new UserLoginService(m_userManager, Cfg, Cfg.DefaultStartupMsg);
MainLog.Instance.Verbose("Main.cs:Startup() - Starting HTTP process");
MainLog.Instance.Verbose("REGION", "Starting HTTP process");
BaseHttpServer httpServer = new BaseHttpServer((int) Cfg.HttpPort);
httpServer.AddXmlRPCHandler("login_to_simulator", m_loginService.XmlRpcLoginMethod);

16
OpenSim/Grid/UserServer/UserLoginService.cs
View File

@ -78,7 +78,7 @@ namespace OpenSim.Grid.UserServer
theUser.homeLocation.Y.ToString() + ",r" + theUser.homeLocation.Z.ToString() + "]}";
// Destination
MainLog.Instance.Verbose("CUSTOMISERESPONSE: Region X: " + SimInfo.regionLocX + "; Region Y: " +
MainLog.Instance.Verbose("LOGIN", "CUSTOMISERESPONSE: Region X: " + SimInfo.regionLocX + "; Region Y: " +
SimInfo.regionLocY);
response.SimAddress = Util.GetHostFromDNS(SimInfo.serverIP).ToString();
response.SimPort = (Int32)SimInfo.serverPort;
@ -90,7 +90,7 @@ namespace OpenSim.Grid.UserServer
response.SeedCapability = SimInfo.httpServerURI + "CAPS/" + capsPath + "0000/";
// Notify the target of an incoming user
MainLog.Instance.Verbose("Notifying " + SimInfo.regionName + " (" + SimInfo.serverURI + ")");
MainLog.Instance.Verbose("LOGIN", "Notifying " + SimInfo.regionName + " (" + SimInfo.serverURI + ")");
// Prepare notification
Hashtable SimParams = new Hashtable();
@ -112,7 +112,7 @@ namespace OpenSim.Grid.UserServer
theUser.currentAgent.currentRegion = SimInfo.UUID;
theUser.currentAgent.currentHandle = SimInfo.regionHandle;
MainLog.Instance.Verbose("Informing region --> " + SimInfo.httpServerURI);
MainLog.Instance.Verbose("LOGIN", "Informing region at " + SimInfo.httpServerURI);
// Send
XmlRpcRequest GridReq = new XmlRpcRequest("expect_user", SendParams);
@ -146,7 +146,7 @@ namespace OpenSim.Grid.UserServer
theUser.homeLocation.Y.ToString() + ",r" + theUser.homeLocation.Z.ToString() + "]}";
// Destination
MainLog.Instance.Verbose("CUSTOMISERESPONSE: Region X: " + SimInfo.regionLocX + "; Region Y: " +
MainLog.Instance.Verbose("LOGIN", "CUSTOMISERESPONSE: Region X: " + SimInfo.regionLocX + "; Region Y: " +
SimInfo.regionLocY);
response.SimAddress = Util.GetHostFromDNS(SimInfo.serverIP).ToString();
response.SimPort = (Int32)SimInfo.serverPort;
@ -158,7 +158,7 @@ namespace OpenSim.Grid.UserServer
response.SeedCapability = SimInfo.httpServerURI + "CAPS/" + capsPath + "0000/";
// Notify the target of an incoming user
MainLog.Instance.Verbose("Notifying " + SimInfo.regionName + " (" + SimInfo.serverURI + ")");
MainLog.Instance.Verbose("LOGIN", "Notifying " + SimInfo.regionName + " (" + SimInfo.serverURI + ")");
// Update agent with target sim
theUser.currentAgent.currentRegion = SimInfo.UUID;
@ -180,7 +180,7 @@ namespace OpenSim.Grid.UserServer
ArrayList SendParams = new ArrayList();
SendParams.Add(SimParams);
MainLog.Instance.Verbose("Informing region --> " + SimInfo.httpServerURI);
MainLog.Instance.Verbose("LOGIN", "Informing region at " + SimInfo.httpServerURI);
// Send
XmlRpcRequest GridReq = new XmlRpcRequest("expect_user", SendParams);
XmlRpcResponse GridResp = GridReq.Send(SimInfo.httpServerURI, 6000);
@ -188,8 +188,8 @@ namespace OpenSim.Grid.UserServer
catch (Exception e)
{
MainLog.Instance.Warn("Default region also not available");
MainLog.Instance.Verbose(e.ToString());
MainLog.Instance.Warn("LOGIN", "Default region also not available");
MainLog.Instance.Verbose("LOGIN", e.ToString());
}
}

4
OpenSim/Region/Application/OpenSimMain.cs
View File

@ -782,12 +782,12 @@ namespace OpenSim
if (m_sceneManager.CurrentScene == null)
{
MainLog.Instance.Verbose(
MainLog.Instance.Verbose("CONSOLE",
"Currently at Root level. To change region please use 'change-region <regioname>'");
}
else
{
MainLog.Instance.Verbose("Current Region: " + m_sceneManager.CurrentScene.RegionInfo.RegionName +
MainLog.Instance.Verbose("CONSOLE", "Current Region: " + m_sceneManager.CurrentScene.RegionInfo.RegionName +
". To change region please use 'change-region <regioname>'");
}

8
OpenSim/Region/ClientStack/ClientView.cs
View File

@ -453,11 +453,11 @@ namespace OpenSim.Region.ClientStack
if (bytesSent > throttleOutboundMax)
{
PacketQueue.Enqueue(nextPacket);
MainLog.Instance.Verbose("Client over throttle limit, requeuing packet");
MainLog.Instance.Verbose("THROTTLE", "Client over throttle limit, requeuing packet");
if (queuedLast)
{
MainLog.Instance.Verbose("No more sendable packets, need to sleep now");
MainLog.Instance.Verbose("THROTTLE", "No more sendable packets, need to sleep now");
Thread.Sleep(100); // Wait a little while if this was the last packet we saw
}
@ -2485,7 +2485,7 @@ namespace OpenSim.Region.ClientStack
{
if ((now - packet.TickCount > RESEND_TIMEOUT) && (!packet.Header.Resent))
{
MainLog.Instance.Verbose("Resending " + packet.Type.ToString() + " packet, " +
MainLog.Instance.Verbose("NETWORK", "Resending " + packet.Type.ToString() + " packet, " +
(now - packet.TickCount) + "ms have passed");
packet.Header.Resent = true;
@ -2504,7 +2504,7 @@ namespace OpenSim.Region.ClientStack
if (PendingAcks.Count > 250)
{
// FIXME: Handle the odd case where we have too many pending ACKs queued up
MainLog.Instance.Verbose("Too many ACKs queued up!");
MainLog.Instance.Verbose("NETWORK", "Too many ACKs queued up!");
return;
}

2
OpenSim/Region/ClientStack/RegionApplicationBase.cs
View File

@ -79,7 +79,7 @@ namespace OpenSim.Region.ClientStack
m_httpServer = new BaseHttpServer(m_httpServerPort);
m_log.Verbose("Starting HTTP server");
m_log.Status("REGION", "Starting HTTP server");
m_httpServer.Start();
}

2
OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
View File

@ -433,7 +433,7 @@ namespace OpenSim.Region.Communications.OGS1
m_localBackend.TriggerExpectUser(regionHandle, agentData);
MainLog.Instance.Verbose("ExpectUser() - Welcoming new user...");
MainLog.Instance.Verbose("GRID", "Welcoming new user...");
return new XmlRpcResponse();
}

2
OpenSim/Region/Communications/OGS1/OGS1UserServices.cs
View File

@ -50,7 +50,7 @@ namespace OpenSim.Region.Communications.OGS1
{
if (data.Contains("error_type"))
{
Console.WriteLine("Error sent by user server when trying to get user profile: (" + data["error_type"] +
OpenSim.Framework.Console.MainLog.Instance.Warn("GRID", "Error sent by user server when trying to get user profile: (" + data["error_type"] +
"): " + data["error_desc"]);
return null;
}

2
OpenSim/Region/Environment/Modules/ChatModule.cs
View File

@ -306,7 +306,7 @@ namespace OpenSim.Region.Environment.Modules
}
catch (Exception)
{
Console.WriteLine("No IRC config information, skipping IRC bridge configuration");
OpenSim.Framework.Console.MainLog.Instance.Verbose("CHAT", "No IRC config information, skipping IRC bridge configuration");
}
m_log = MainLog.Instance;
}

2
OpenSim/Region/Environment/Scenes/InnerScene.cs
View File

@ -700,7 +700,7 @@ namespace OpenSim.Region.Environment.Scenes
}
else
{
OpenSim.Framework.Console.MainLog.Instance.Verbose(
OpenSim.Framework.Console.MainLog.Instance.Verbose("SCENE",
"DelinkObjects(): Could not find a root prim out of {0} as given to a delink request!",
primIds);
}

8
OpenSim/Region/Environment/Scenes/Scene.cs
View File

@ -239,12 +239,12 @@ namespace OpenSim.Region.Environment.Scenes
RegisterDefaultSceneEvents();
MainLog.Instance.Verbose("Creating new entitities instance");
MainLog.Instance.Verbose("SCENE", "Creating new entitities instance");
Entities = new Dictionary<LLUUID, EntityBase>();
m_scenePresences = new Dictionary<LLUUID, ScenePresence>();
m_sceneObjects = new Dictionary<LLUUID, SceneObjectGroup>();
MainLog.Instance.Verbose("Creating LandMap");
MainLog.Instance.Verbose("SCENE", "Creating LandMap");
Terrain = new TerrainEngine((int)RegionInfo.RegionLocX, (int)RegionInfo.RegionLocY);
ScenePresence.LoadAnims();
@ -727,7 +727,7 @@ namespace OpenSim.Region.Environment.Scenes
/// </summary>
public virtual void LoadPrimsFromStorage(bool m_permissions)
{
MainLog.Instance.Verbose("Loading objects from datastore");
MainLog.Instance.Verbose("SCENE", "Loading objects from datastore");
List<SceneObjectGroup> PrimsFromDB = m_storageManager.DataStore.LoadObjects(m_regInfo.RegionID);
foreach (SceneObjectGroup prim in PrimsFromDB)
{
@ -759,7 +759,7 @@ namespace OpenSim.Region.Environment.Scenes
rootPart.RotationOffset.Y, rootPart.RotationOffset.Z), UsePhysics);
rootPart.DoPhysicsPropertyUpdate(UsePhysics, true);
}
MainLog.Instance.Verbose("Loaded " + PrimsFromDB.Count.ToString() + " SceneObject(s)");
MainLog.Instance.Verbose("SCENE", "Loaded " + PrimsFromDB.Count.ToString() + " SceneObject(s)");
}

2
OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
View File

@ -943,7 +943,7 @@ namespace OpenSim.Region.Environment.Scenes
}
else
{
OpenSim.Framework.Console.MainLog.Instance.Verbose(
OpenSim.Framework.Console.MainLog.Instance.Verbose("SCENE",
"DelinkFromGroup(): Child prim local id {0} not found in object with root prim id {1}",
partID, LocalId);
}

2
OpenSim/Region/ExtensionsScriptModule/Script.cs
View File

@ -53,7 +53,7 @@ namespace OpenSim.Region.ExtensionsScriptModule
private void events_OnNewPresence(ScenePresence presence)
{
script.logger.Verbose("Hello " + presence.Firstname.ToString() + "!");
script.logger.Verbose("TESTSCRIPT", "Hello " + presence.Firstname.ToString() + "!");
}
private void events_OnFrame()

6
OpenSim/Region/ExtensionsScriptModule/ScriptManager.cs
View File

@ -48,12 +48,12 @@ namespace OpenSim.Region.ExtensionsScriptModule
{
ScriptInfo scriptInfo = new ScriptInfo(m_scene);
// Since each script could potentially corrupt their access with a stray assignment, making a new one for each script.
MainLog.Instance.Verbose("Loading " + script.Key);
MainLog.Instance.Verbose("SCRIPT", "Loading " + script.Key);
script.Value.Initialise(scriptInfo);
scripts.Add(script.Value);
}
MainLog.Instance.Verbose(string.Format("Finished loading {0} script(s)", compiledscripts.Count));
MainLog.Instance.Verbose("SCRIPT", string.Format("Finished loading {0} script(s)", compiledscripts.Count));
}
public ScriptManager()
@ -125,7 +125,7 @@ namespace OpenSim.Region.ExtensionsScriptModule
public bool AddPreCompiledScript(IScript script)
{
MainLog.Instance.Verbose("Loading script " + script.Name);
MainLog.Instance.Verbose("SCRIPT", "Loading script " + script.Name);
ScriptInfo scriptInfo = new ScriptInfo(m_scene);
// Since each script could potentially corrupt their access with a stray assignment, making a new one for each script.
script.Initialise(scriptInfo);

8
OpenSim/Region/Physics/Manager/PhysicsScene.cs
View File

@ -92,7 +92,7 @@ namespace OpenSim.Region.Physics.Manager
public override PhysicsActor AddAvatar(string avName, PhysicsVector position)
{
MainLog.Instance.Verbose("NullPhysicsScene : AddAvatar({0})", position);
MainLog.Instance.Verbose("PHYSICS", "NullPhysicsScene : AddAvatar({0})", position);
return PhysicsActor.Null;
}
@ -119,7 +119,7 @@ namespace OpenSim.Region.Physics.Manager
public override PhysicsActor AddPrimShape(string primName, PrimitiveBaseShape pbs, PhysicsVector position,
PhysicsVector size, Quaternion rotation, bool isPhysical)
{
MainLog.Instance.Verbose("NullPhysicsScene : AddPrim({0},{1})", position, size);
MainLog.Instance.Verbose("PHYSICS", "NullPhysicsScene : AddPrim({0},{1})", position, size);
return PhysicsActor.Null;
}
public override void AddPhysicsActorTaint(PhysicsActor prim)
@ -135,12 +135,12 @@ namespace OpenSim.Region.Physics.Manager
public override void GetResults()
{
MainLog.Instance.Verbose("NullPhysicsScene : GetResults()");
MainLog.Instance.Verbose("PHYSICS", "NullPhysicsScene : GetResults()");
}
public override void SetTerrain(float[] heightMap)
{
MainLog.Instance.Verbose("NullPhysicsScene : SetTerrain({0} items)", heightMap.Length);
MainLog.Instance.Verbose("PHYSICS", "NullPhysicsScene : SetTerrain({0} items)", heightMap.Length);
}
public override void DeleteTerrain()

4
OpenSim/Region/Storage/OpenSim.DataStore.MonoSqlite/MonoSqliteDataStore.cs
View File

@ -248,10 +248,10 @@ namespace OpenSim.DataStore.MonoSqlite
catch (Exception e)
{
MainLog.Instance.Error("DATASTORE", "Failed create prim object, exception and data follows");
MainLog.Instance.Verbose(e.ToString());
MainLog.Instance.Verbose("DATASTORE", e.ToString());
foreach (DataColumn col in prims.Columns)
{
MainLog.Instance.Verbose("Col: " + col.ColumnName + " => " + primRow[col]);
MainLog.Instance.Verbose("DATASTORE", "Col: " + col.ColumnName + " => " + primRow[col]);
}
}
}