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

* Since remoting exceptions occur quite often in some cases (e.g. when a neighbouring region is down), put out only the source and message of the RemotingException (not the stack trace) to the console. 

* It doesn't appear that the remoting stack trace yields any useful information anyway
0.6.0-stable
Justin Clarke Casey 2008-03-12 17:37:00 +00:00
parent 42123770de
commit c310f2ab24
1 changed files with 65 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -605,39 +605,55 @@ namespace OpenSim.Region.Communications.OGS1
catch (RemotingException e) catch (RemotingException e)
{ {
NoteDeadRegion(regionHandle); NoteDeadRegion(regionHandle);
m_log.Warn("Remoting Error: Unable to connect to adjacent region: " +
" " + regInfo.RegionLocX + "," + regInfo.RegionLocY); m_log.WarnFormat(
m_log.Debug(e.ToString()); "Remoting Error: Unable to connect to adjacent region: {0} {1},{2}",
regInfo.RegionName, regInfo.RegionLocX, regInfo.RegionLocY);
m_log.DebugFormat("Remoting Error: {0} {1}", e.Source, e.Message);
return false; return false;
} }
catch (SocketException e) catch (SocketException e)
{ {
NoteDeadRegion(regionHandle); NoteDeadRegion(regionHandle);
m_log.Warn("Socket Error: Unable to connect to adjacent region: " + " " +
regInfo.RegionLocX + "," + regInfo.RegionLocY); m_log.WarnFormat(
m_log.Debug(e.ToString()); "Remoting Error: Unable to connect to adjacent region: {0} {1},{2}",
regInfo.RegionName, regInfo.RegionLocX, regInfo.RegionLocY);
m_log.DebugFormat("Remoting Error: {0} {1}", e.Source, e.Message);
return false; return false;
} }
catch (InvalidCredentialException e) catch (InvalidCredentialException e)
{ {
NoteDeadRegion(regionHandle); NoteDeadRegion(regionHandle);
m_log.Warn("Invalid Credentials: Unable to connect to adjacent region: " +
" " + regInfo.RegionLocX + "," + regInfo.RegionLocY); m_log.WarnFormat(
m_log.Debug(e.ToString()); "Remoting Error: Unable to connect to adjacent region: {0} {1},{2}",
regInfo.RegionName, regInfo.RegionLocX, regInfo.RegionLocY);
m_log.DebugFormat("Remoting Error: {0} {1}", e.Source, e.Message);
return false; return false;
} }
catch (AuthenticationException e) catch (AuthenticationException e)
{ {
NoteDeadRegion(regionHandle); NoteDeadRegion(regionHandle);
m_log.Warn("Authentication exception: Unable to connect to adjacent region: " +
" " + regInfo.RegionLocX + "," + regInfo.RegionLocY); m_log.WarnFormat(
m_log.Debug(e.ToString()); "Remoting Error: Unable to connect to adjacent region: {0} {1},{2}",
regInfo.RegionName, regInfo.RegionLocX, regInfo.RegionLocY);
m_log.DebugFormat("Remoting Error: {0} {1}", e.Source, e.Message);
return false; return false;
} }
catch (Exception e) catch (Exception e)
{ {
NoteDeadRegion(regionHandle); NoteDeadRegion(regionHandle);
m_log.Debug(e.ToString());
m_log.WarnFormat("Unable to connect to adjacent region: {0} {1},{2}",
regInfo.RegionName, regInfo.RegionLocX, regInfo.RegionLocY);
m_log.DebugFormat("{0} {1}", e.Source, e.Message);
return false; return false;
} }
} }
@ -700,41 +716,56 @@ namespace OpenSim.Region.Communications.OGS1
catch (RemotingException e) catch (RemotingException e)
{ {
NoteDeadRegion(regionHandle); NoteDeadRegion(regionHandle);
m_log.Warn("Remoting Error: Unable to connect to adjacent region: " + regInfo.RegionName +
" " + regInfo.RegionLocX + "," + regInfo.RegionLocY); m_log.WarnFormat(
m_log.Debug(e.ToString()); "Remoting Error: Unable to connect to adjacent region: {0} {1},{2}",
regInfo.RegionName, regInfo.RegionLocX, regInfo.RegionLocY);
m_log.DebugFormat("Remoting Error: {0} {1}", e.Source, e.Message);
return false; return false;
} }
catch (SocketException e) catch (SocketException e)
{ {
NoteDeadRegion(regionHandle); NoteDeadRegion(regionHandle);
m_log.Warn("Socket Error: Unable to connect to adjacent region: " + regInfo.RegionName + " " +
regInfo.RegionLocX + "," + regInfo.RegionLocY); m_log.WarnFormat(
m_log.Debug(e.ToString()); "Remoting Error: Unable to connect to adjacent region: {0} {1},{2}",
regInfo.RegionName, regInfo.RegionLocX, regInfo.RegionLocY);
m_log.DebugFormat("Remoting Error: {0} {1}", e.Source, e.Message);
return false; return false;
} }
catch (InvalidCredentialException e) catch (InvalidCredentialException e)
{ {
NoteDeadRegion(regionHandle); NoteDeadRegion(regionHandle);
m_log.Warn("Invalid Credentials: Unable to connect to adjacent region: " + regInfo.RegionName +
" " + regInfo.RegionLocX + "," + regInfo.RegionLocY); m_log.WarnFormat(
m_log.Debug(e.ToString()); "Remoting Error: Unable to connect to adjacent region: {0} {1},{2}",
regInfo.RegionName, regInfo.RegionLocX, regInfo.RegionLocY);
m_log.DebugFormat("Remoting Error: {0} {1}", e.Source, e.Message);
return false; return false;
} }
catch (AuthenticationException e) catch (AuthenticationException e)
{ {
NoteDeadRegion(regionHandle); NoteDeadRegion(regionHandle);
m_log.Warn("Authentication exception: Unable to connect to adjacent region: " +
regInfo.RegionName + " " + regInfo.RegionLocX + "," + regInfo.RegionLocY); m_log.WarnFormat(
m_log.Debug(e.ToString()); "Remoting Error: Unable to connect to adjacent region: {0} {1},{2}",
regInfo.RegionName, regInfo.RegionLocX, regInfo.RegionLocY);
m_log.DebugFormat("Remoting Error: {0} {1}", e.Source, e.Message);
return false; return false;
} }
catch (Exception e) catch (Exception e)
{ {
NoteDeadRegion(regionHandle); NoteDeadRegion(regionHandle);
m_log.Warn("Unknown exception: Unable to connect to adjacent region: " + regInfo.RegionName +
" " + regInfo.RegionLocX + "," + regInfo.RegionLocY); m_log.WarnFormat(
m_log.Debug(e.ToString()); "Remoting Error: Unable to connect to adjacent region: {0} {1},{2}",
regInfo.RegionName, regInfo.RegionLocX, regInfo.RegionLocY);
m_log.DebugFormat("Remoting Error: {0} {1}", e.Source, e.Message);
return false; return false;
} }
} }
@ -994,9 +1025,12 @@ namespace OpenSim.Region.Communications.OGS1
catch (RemotingException e) catch (RemotingException e)
{ {
NoteDeadRegion(regionHandle); NoteDeadRegion(regionHandle);
m_log.Warn("Remoting Error: Unable to connect to adjacent region: " + regInfo.RegionName +
" " + regInfo.RegionLocX + "," + regInfo.RegionLocY); m_log.WarnFormat(
m_log.Debug(e.ToString()); "Remoting Error: Unable to connect to adjacent region: {0} {1},{2}",
regInfo.RegionName, regInfo.RegionLocX, regInfo.RegionLocY);
m_log.DebugFormat("Remoting Error: {0} {1}", e.Source, e.Message);
return false; return false;
} }
catch catch