aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Framework/Servers/BaseHttpServer.cs24
1 files changed, 14 insertions, 10 deletions
diff --git a/OpenSim/Framework/Servers/BaseHttpServer.cs b/OpenSim/Framework/Servers/BaseHttpServer.cs
index 66119dc..d7cf96e 100644
--- a/OpenSim/Framework/Servers/BaseHttpServer.cs
+++ b/OpenSim/Framework/Servers/BaseHttpServer.cs
@@ -1381,8 +1381,12 @@ namespace OpenSim.Framework.Servers
1381 m_httpListener2 = new HttpServer.HttpListener(IPAddress.Any, (int)m_port); 1381 m_httpListener2 = new HttpServer.HttpListener(IPAddress.Any, (int)m_port);
1382 m_httpListener2.ExceptionThrown += httpServerException; 1382 m_httpListener2.ExceptionThrown += httpServerException;
1383 m_httpListener2.LogWriter = httpserverlog; 1383 m_httpListener2.LogWriter = httpserverlog;
1384 m_httpListener2.DisconnectHandler = httpServerDisconnectMonitor;
1385 1384
1385 // Uncomment this line in addition to those in HttpServerLogWriter
1386 // if you want more detailed trace information from the HttpServer
1387 //m_httpListener2.UseTraceLogs = true;
1388
1389 m_httpListener2.DisconnectHandler = httpServerDisconnectMonitor;
1386 } 1390 }
1387 else 1391 else
1388 { 1392 {
@@ -1559,19 +1563,18 @@ namespace OpenSim.Framework.Servers
1559 oreq = osreq; 1563 oreq = osreq;
1560 oresp = osresp; 1564 oresp = osresp;
1561 } 1565 }
1562
1563 } 1566 }
1567
1568 /// <summary>
1569 /// Relays HttpServer log messages to our own logging mechanism.
1570 /// </summary>
1571 /// There is also a UseTraceLogs line in this file that can be uncommented for more detailed log information
1564 public class HttpServerLogWriter : HttpServer.ILogWriter 1572 public class HttpServerLogWriter : HttpServer.ILogWriter
1565 { 1573 {
1566 //private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 1574 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
1567
1568 public HttpServerLogWriter()
1569 {
1570 }
1571 1575
1572 public void Write(object source, HttpServer.LogPrio priority, string message) 1576 public void Write(object source, HttpServer.LogPrio priority, string message)
1573 { 1577 {
1574 return;
1575 /* 1578 /*
1576 switch (priority) 1579 switch (priority)
1577 { 1580 {
@@ -1592,9 +1595,10 @@ namespace OpenSim.Framework.Servers
1592 break; 1595 break;
1593 default: 1596 default:
1594 break; 1597 break;
1595
1596 } 1598 }
1597 */ 1599 */
1600
1601 return;
1598 } 1602 }
1599 1603
1600 } 1604 }