aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Servers
diff options
context:
space:
mode:
authorTeravus Ovares2008-12-18 13:17:54 +0000
committerTeravus Ovares2008-12-18 13:17:54 +0000
commita66657f155d5579546cd38487fcaad0b88394c4b (patch)
tree9518046709185eee13eb26a99b7595cc15a7c2f7 /OpenSim/Framework/Servers
parent* Added "show queues" command that shows throttling queues for all clients. (diff)
downloadopensim-SC_OLD-a66657f155d5579546cd38487fcaad0b88394c4b.zip
opensim-SC_OLD-a66657f155d5579546cd38487fcaad0b88394c4b.tar.gz
opensim-SC_OLD-a66657f155d5579546cd38487fcaad0b88394c4b.tar.bz2
opensim-SC_OLD-a66657f155d5579546cd38487fcaad0b88394c4b.tar.xz
* Tweak my previously mentioned nasty hack so it's a little less nasty
Diffstat (limited to 'OpenSim/Framework/Servers')
-rw-r--r--OpenSim/Framework/Servers/BaseHttpServer.cs14
1 files changed, 8 insertions, 6 deletions
diff --git a/OpenSim/Framework/Servers/BaseHttpServer.cs b/OpenSim/Framework/Servers/BaseHttpServer.cs
index 91ad3a3..c182dfc 100644
--- a/OpenSim/Framework/Servers/BaseHttpServer.cs
+++ b/OpenSim/Framework/Servers/BaseHttpServer.cs
@@ -1406,12 +1406,7 @@ namespace OpenSim.Framework.Servers
1406 { 1406 {
1407 case SocketError.NotSocket: 1407 case SocketError.NotSocket:
1408 NotSocketErrors++; 1408 NotSocketErrors++;
1409 if (HTTPDRunning)// && NotSocketErrors > 5) 1409
1410 {
1411 Stop();
1412 StartHTTP();
1413 m_log.Warn("[HTTPSERVER]: Died. Trying to kick.....");
1414 }
1415 break; 1410 break;
1416 } 1411 }
1417 } 1412 }
@@ -1419,6 +1414,13 @@ namespace OpenSim.Framework.Servers
1419 public void httpServerException(object source, Exception exception) 1414 public void httpServerException(object source, Exception exception)
1420 { 1415 {
1421 m_log.ErrorFormat("[HTTPSERVER]: {0} had an exception {1}", source.ToString(), exception.ToString()); 1416 m_log.ErrorFormat("[HTTPSERVER]: {0} had an exception {1}", source.ToString(), exception.ToString());
1417 if (HTTPDRunning)// && NotSocketErrors > 5)
1418 {
1419 Stop();
1420 Thread.Sleep(200);
1421 StartHTTP();
1422 m_log.Warn("[HTTPSERVER]: Died. Trying to kick.....");
1423 }
1422 } 1424 }
1423 1425
1424 public void Stop() 1426 public void Stop()