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

fixed filenames in log messages

afrisby
Jeff Ames 2007-10-31 07:56:31 +00:00
parent 064404ab40
commit 13854d562f
9 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Framework/Servers/CheckSumServer.cs
View File

@ -113,7 +113,7 @@ namespace OpenSim.Framework.Servers
} }
catch (Exception) catch (Exception)
{ {
OpenSim.Framework.Console.MainLog.Instance.Warn("OpenSimClient.cs:ProcessOutPacket() - WARNING: Socket exception occurred on connection "); OpenSim.Framework.Console.MainLog.Instance.Warn("CheckSumServer.cs:ProcessOutPacket() - WARNING: Socket exception occurred on connection ");
} }
} }

8
OpenSim/Grid/GridServer.Config/DbGridConfig.cs
View File

@ -63,7 +63,7 @@ namespace OpenGrid.Config.GridConfigDb4o
/// User configuration for the Grid Config interfaces /// User configuration for the Grid Config interfaces
/// </summary> /// </summary>
public void LoadDefaults() { public void LoadDefaults() {
MainLog.Instance.Notice("Config.cs:LoadDefaults() - Please press enter to retain default or enter new settings"); MainLog.Instance.Notice("DbGridConfig.cs:LoadDefaults() - Please press enter to retain default or enter new settings");
// About the grid options // About the grid options
this.GridOwner = MainLog.Instance.CmdPrompt("Grid owner", "OGS development team"); this.GridOwner = MainLog.Instance.CmdPrompt("Grid owner", "OGS development team");
@ -95,7 +95,7 @@ namespace OpenGrid.Config.GridConfigDb4o
IObjectSet result = db.Get(typeof(DbGridConfig)); IObjectSet result = db.Get(typeof(DbGridConfig));
// Found? // Found?
if(result.Count==1) { if(result.Count==1) {
MainLog.Instance.Verbose("Config.cs:InitConfig() - Found a GridConfig object in the local database, loading"); MainLog.Instance.Verbose("DbGridConfig.cs:InitConfig() - Found a GridConfig object in the local database, loading");
foreach (DbGridConfig cfg in result) { foreach (DbGridConfig cfg in result) {
// Import each setting into this class // Import each setting into this class
// Grid Settings // Grid Settings
@ -114,7 +114,7 @@ namespace OpenGrid.Config.GridConfigDb4o
} }
// Create a new configuration object from this class // Create a new configuration object from this class
} else { } else {
MainLog.Instance.Verbose("Config.cs:InitConfig() - Could not find object in database, loading precompiled defaults"); MainLog.Instance.Verbose("DbGridConfig.cs:InitConfig() - Could not find object in database, loading precompiled defaults");
// Load default settings into this class // Load default settings into this class
LoadDefaults(); LoadDefaults();
@ -127,7 +127,7 @@ namespace OpenGrid.Config.GridConfigDb4o
db.Close(); db.Close();
} }
} catch(Exception e) { } catch(Exception e) {
MainLog.Instance.Warn("Config.cs:InitConfig() - Exception occured"); MainLog.Instance.Warn("DbGridConfig.cs:InitConfig() - Exception occured");
MainLog.Instance.Warn(e.ToString()); MainLog.Instance.Warn(e.ToString());
} }

8
OpenSim/Grid/UserServer.Config/DbUserConfig.cs
View File

@ -47,7 +47,7 @@ namespace OpenUser.Config.UserConfigDb4o
private IObjectContainer db; private IObjectContainer db;
public void LoadDefaults() { public void LoadDefaults() {
MainLog.Instance.Notice("Config.cs:LoadDefaults() - Please press enter to retain default or enter new settings"); MainLog.Instance.Notice("DbUserConfig.cs:LoadDefaults() - Please press enter to retain default or enter new settings");
this.DefaultStartupMsg = MainLog.Instance.CmdPrompt("Default startup message", "Welcome to OGS"); this.DefaultStartupMsg = MainLog.Instance.CmdPrompt("Default startup message", "Welcome to OGS");
@ -61,7 +61,7 @@ namespace OpenUser.Config.UserConfigDb4o
db = Db4oFactory.OpenFile("openuser.yap"); db = Db4oFactory.OpenFile("openuser.yap");
IObjectSet result = db.Get(typeof(DbUserConfig)); IObjectSet result = db.Get(typeof(DbUserConfig));
if(result.Count==1) { if(result.Count==1) {
MainLog.Instance.Verbose("Config.cs:InitConfig() - Found a UserConfig object in the local database, loading"); MainLog.Instance.Verbose("DbUserConfig.cs:InitConfig() - Found a UserConfig object in the local database, loading");
foreach (DbUserConfig cfg in result) { foreach (DbUserConfig cfg in result) {
this.GridServerURL=cfg.GridServerURL; this.GridServerURL=cfg.GridServerURL;
this.GridSendKey=cfg.GridSendKey; this.GridSendKey=cfg.GridSendKey;
@ -69,14 +69,14 @@ namespace OpenUser.Config.UserConfigDb4o
this.DefaultStartupMsg=cfg.DefaultStartupMsg; this.DefaultStartupMsg=cfg.DefaultStartupMsg;
} }
} else { } else {
MainLog.Instance.Verbose("Config.cs:InitConfig() - Could not find object in database, loading precompiled defaults"); MainLog.Instance.Verbose("DbUserConfig.cs:InitConfig() - Could not find object in database, loading precompiled defaults");
LoadDefaults(); LoadDefaults();
MainLog.Instance.Verbose("Writing out default settings to local database"); MainLog.Instance.Verbose("Writing out default settings to local database");
db.Set(this); db.Set(this);
db.Close(); db.Close();
} }
} catch(Exception e) { } catch(Exception e) {
MainLog.Instance.Warn("Config.cs:InitConfig() - Exception occured"); MainLog.Instance.Warn("DbUserConfig.cs:InitConfig() - Exception occured");
MainLog.Instance.Warn(e.ToString()); MainLog.Instance.Warn(e.ToString());
} }

4
OpenSim/Region/ClientStack/ClientView.API.cs
View File

@ -297,7 +297,7 @@ namespace OpenSim.Region.ClientStack
catch (Exception e) catch (Exception e)
{ {
MainLog.Instance.Warn("client", MainLog.Instance.Warn("client",
"ClientView API.cs: SendLayerData() - Failed with exception " + e.ToString()); "ClientView.API.cs: SendLayerData() - Failed with exception " + e.ToString());
} }
} }
@ -324,7 +324,7 @@ namespace OpenSim.Region.ClientStack
catch (Exception e) catch (Exception e)
{ {
MainLog.Instance.Warn("client", MainLog.Instance.Warn("client",
"ClientView API .cs: SendLayerData() - Failed with exception " + e.ToString()); "ClientView.API.cs: SendLayerData() - Failed with exception " + e.ToString());
} }
} }

2
OpenSim/Region/ClientStack/ClientView.PacketQueue.cs
View File

@ -158,7 +158,7 @@ namespace OpenSim.Region.ClientStack
catch (Exception) catch (Exception)
{ {
MainLog.Instance.Warn("client", MainLog.Instance.Warn("client",
"OpenSimClient.cs:ProcessOutPacket() - WARNING: Socket exception occurred on connection " + "ClientView.PacketQueue.cs:ProcessOutPacket() - WARNING: Socket exception occurred on connection " +
userEP.ToString() + " - killing thread"); userEP.ToString() + " - killing thread");
KillThread(); KillThread();
} }

2
OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs
View File

@ -388,7 +388,7 @@ namespace OpenSim.Region.ClientStack
} }
break; break;
case PacketType.TransferRequest: case PacketType.TransferRequest:
//Console.WriteLine("OpenSimClient.cs:ProcessInPacket() - Got transfer request"); //Console.WriteLine("ClientView.ProcessPackets.cs:ProcessInPacket() - Got transfer request");
TransferRequestPacket transfer = (TransferRequestPacket) Pack; TransferRequestPacket transfer = (TransferRequestPacket) Pack;
m_assetCache.AddAssetRequest(this, transfer); m_assetCache.AddAssetRequest(this, transfer);
break; break;

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

@ -497,7 +497,7 @@ namespace OpenSim.Region.Environment.Scenes
} }
catch (Exception e) catch (Exception e)
{ {
MainLog.Instance.Warn("terrain", "World.cs: LoadWorldMap() - Failed with exception " + e.ToString()); MainLog.Instance.Warn("terrain", "Scene.cs: LoadWorldMap() - Failed with exception " + e.ToString());
} }
} }
@ -1079,7 +1079,7 @@ namespace OpenSim.Region.Environment.Scenes
/// <param name="agent"></param> /// <param name="agent"></param>
public void NewUserConnection(ulong regionHandle, AgentCircuitData agent) public void NewUserConnection(ulong regionHandle, AgentCircuitData agent)
{ {
// Console.WriteLine("World.cs - add new user connection"); // Console.WriteLine("Scene.cs - add new user connection");
//should just check that its meant for this region //should just check that its meant for this region
if (regionHandle == m_regInfo.RegionHandle) if (regionHandle == m_regInfo.RegionHandle)
{ {

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

@ -146,7 +146,7 @@ namespace OpenSim.Region.Environment.Scenes
} }
catch (Exception e) catch (Exception e)
{ {
MainLog.Instance.Error("SCENE", "World.cs: Close() - Failed with exception " + e.ToString()); MainLog.Instance.Error("SCENE", "SceneBase.cs: Close() - Failed with exception " + e.ToString());
} }
} }

2
OpenSim/Region/Environment/Scenes/ScenePresence.Animations.cs
View File

@ -44,7 +44,7 @@ namespace OpenSim.Region.Environment.Scenes
public void LoadAnims() public void LoadAnims()
{ {
//OpenSim.Framework.Console.MainLog.Instance.Verbose("Avatar.cs:LoadAnims() - Loading avatar animations"); //OpenSim.Framework.Console.MainLog.Instance.Verbose("ScenePresence.Animations.cs:LoadAnims() - Loading avatar animations");
using (XmlTextReader reader = new XmlTextReader("data/avataranimations.xml")) using (XmlTextReader reader = new XmlTextReader("data/avataranimations.xml"))
{ {
XmlDocument doc = new XmlDocument(); XmlDocument doc = new XmlDocument();