diff --git a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs index 3d6051d895..8eeb0679ac 100644 --- a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs +++ b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs @@ -40,7 +40,8 @@ using HttpServer; using log4net; using Nwc.XmlRpc; using OpenMetaverse.StructuredData; -using CoolHTTPListener = HttpServer.HttpListener; +using CoolHTTPListener = HttpServer.HttpListener; +using CoolHttpServer = HttpServer; using HttpListener=System.Net.HttpListener; namespace OpenSim.Framework.Servers.HttpServer @@ -729,12 +730,12 @@ namespace OpenSim.Framework.Servers.HttpServer xmlRpcResponse = method(xmlRprcRequest, request.RemoteIPEndPoint); } catch(Exception e) - { - string errorMessage - = String.Format( - "Requested method [{0}] from {1} threw exception: {2} {3}", - methodName, request.RemoteIPEndPoint.Address, e.Message, e.StackTrace); - + { + string errorMessage + = String.Format( + "Requested method [{0}] from {1} threw exception: {2} {3}", + methodName, request.RemoteIPEndPoint.Address, e.Message, e.StackTrace); + m_log.ErrorFormat("[BASE HTTP SERVER]: {0}", errorMessage); // if the registered XmlRpc method threw an exception, we pass a fault-code along @@ -1819,34 +1820,32 @@ namespace OpenSim.Framework.Servers.HttpServer /// There is also a UseTraceLogs line in this file that can be uncommented for more detailed log information public class HttpServerLogWriter : ILogWriter { - //private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); + private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); public void Write(object source, LogPrio priority, string message) { - /* switch (priority) - { - case HttpServer.LogPrio.Debug: + { + case CoolHttpServer.LogPrio.Debug: m_log.DebugFormat("[{0}]: {1}", source.ToString(), message); - break; - case HttpServer.LogPrio.Error: + break; + case CoolHttpServer.LogPrio.Error: m_log.ErrorFormat("[{0}]: {1}", source.ToString(), message); - break; - case HttpServer.LogPrio.Info: + break; + case CoolHttpServer.LogPrio.Info: m_log.InfoFormat("[{0}]: {1}", source.ToString(), message); - break; - case HttpServer.LogPrio.Warning: + break; + case CoolHttpServer.LogPrio.Warning: m_log.WarnFormat("[{0}]: {1}", source.ToString(), message); - break; - case HttpServer.LogPrio.Fatal: + break; + case CoolHttpServer.LogPrio.Fatal: m_log.ErrorFormat("[{0}]: FATAL! - {1}", source.ToString(), message); break; default: break; } - */ return; } } -} +} \ No newline at end of file diff --git a/bin/AprSharp.dll b/bin/AprSharp.dll old mode 100644 new mode 100755 diff --git a/bin/AprSharp.pdb b/bin/AprSharp.pdb old mode 100644 new mode 100755 diff --git a/bin/AssetInventoryServer.ini.example b/bin/AssetInventoryServer.ini.example old mode 100644 new mode 100755 diff --git a/bin/Axiom.MathLib.dll b/bin/Axiom.MathLib.dll old mode 100644 new mode 100755 diff --git a/bin/BclExtras.dll b/bin/BclExtras.dll old mode 100644 new mode 100755 diff --git a/bin/BulletDotNET.dll b/bin/BulletDotNET.dll old mode 100644 new mode 100755 diff --git a/bin/BulletDotNET.pdb b/bin/BulletDotNET.pdb old mode 100644 new mode 100755 diff --git a/bin/C5.dll b/bin/C5.dll old mode 100644 new mode 100755 diff --git a/bin/CSJ2K.dll b/bin/CSJ2K.dll old mode 100644 new mode 100755 diff --git a/bin/Castle.Core.dll b/bin/Castle.Core.dll old mode 100644 new mode 100755 diff --git a/bin/Castle.DynamicProxy.dll b/bin/Castle.DynamicProxy.dll old mode 100644 new mode 100755 diff --git a/bin/Castle.DynamicProxy2.dll b/bin/Castle.DynamicProxy2.dll old mode 100644 new mode 100755 diff --git a/bin/CookComputing.XmlRpcV2.dll b/bin/CookComputing.XmlRpcV2.dll old mode 100644 new mode 100755 diff --git a/bin/DotNetOpenId.dll b/bin/DotNetOpenId.dll old mode 100644 new mode 100755 diff --git a/bin/DotNetOpenMail.dll b/bin/DotNetOpenMail.dll old mode 100644 new mode 100755 diff --git a/bin/DotSets.dll b/bin/DotSets.dll old mode 100644 new mode 100755 diff --git a/bin/Fadd.Globalization.Yaml.dll b/bin/Fadd.Globalization.Yaml.dll old mode 100644 new mode 100755 diff --git a/bin/Fadd.dll b/bin/Fadd.dll old mode 100644 new mode 100755 diff --git a/bin/GlynnTucker.Cache.dll b/bin/GlynnTucker.Cache.dll old mode 100644 new mode 100755 diff --git a/bin/HttpServer.dll b/bin/HttpServer.dll old mode 100644 new mode 100755 diff --git a/bin/HttpServer_OpenSim.dll b/bin/HttpServer_OpenSim.dll old mode 100644 new mode 100755 diff --git a/bin/HttpServer_OpenSim.pdb b/bin/HttpServer_OpenSim.pdb old mode 100644 new mode 100755 diff --git a/bin/HttpServer_OpenSim.xml b/bin/HttpServer_OpenSim.xml old mode 100644 new mode 100755 diff --git a/bin/Iesi.Collections.dll b/bin/Iesi.Collections.dll old mode 100644 new mode 100755 diff --git a/bin/IronMath.dll b/bin/IronMath.dll old mode 100644 new mode 100755 diff --git a/bin/IronPython.dll b/bin/IronPython.dll old mode 100644 new mode 100755 diff --git a/bin/Kds.Serialization.dll b/bin/Kds.Serialization.dll old mode 100644 new mode 100755 diff --git a/bin/LaunchSLClient.ini b/bin/LaunchSLClient.ini old mode 100644 new mode 100755 diff --git a/bin/MXP.dll b/bin/MXP.dll old mode 100644 new mode 100755 diff --git a/bin/MXP.pdb b/bin/MXP.pdb old mode 100644 new mode 100755 diff --git a/bin/Modified.XnaDevRu.BulletX.dll b/bin/Modified.XnaDevRu.BulletX.dll old mode 100644 new mode 100755 diff --git a/bin/Mono.Addins.dll b/bin/Mono.Addins.dll old mode 100644 new mode 100755 diff --git a/bin/Mono.Addins.dll.config b/bin/Mono.Addins.dll.config old mode 100644 new mode 100755 diff --git a/bin/Mono.Data.SqliteClient.dll b/bin/Mono.Data.SqliteClient.dll old mode 100644 new mode 100755 diff --git a/bin/Mono.GetOptions.dll b/bin/Mono.GetOptions.dll old mode 100644 new mode 100755 diff --git a/bin/Mono.PEToolkit.dll b/bin/Mono.PEToolkit.dll old mode 100644 new mode 100755 diff --git a/bin/Mono.Security.dll b/bin/Mono.Security.dll old mode 100644 new mode 100755 diff --git a/bin/MonoXnaCompactMaths.dll b/bin/MonoXnaCompactMaths.dll old mode 100644 new mode 100755 diff --git a/bin/MySql.Data.dll b/bin/MySql.Data.dll old mode 100644 new mode 100755 diff --git a/bin/NDesk.Options.dll b/bin/NDesk.Options.dll old mode 100644 new mode 100755 diff --git a/bin/Newtonsoft.Json.XML b/bin/Newtonsoft.Json.XML old mode 100644 new mode 100755 diff --git a/bin/Newtonsoft.Json.dll b/bin/Newtonsoft.Json.dll old mode 100644 new mode 100755 diff --git a/bin/Newtonsoft.Json.pdb b/bin/Newtonsoft.Json.pdb old mode 100644 new mode 100755 diff --git a/bin/Nini.dll b/bin/Nini.dll old mode 100644 new mode 100755 diff --git a/bin/Npgsql.dll b/bin/Npgsql.dll old mode 100644 new mode 100755 diff --git a/bin/Ode.NET.dll b/bin/Ode.NET.dll old mode 100644 new mode 100755 diff --git a/bin/Ode.NET.dll.config b/bin/Ode.NET.dll.config old mode 100644 new mode 100755 diff --git a/bin/OpenMetaverse.Http.XML b/bin/OpenMetaverse.Http.XML old mode 100644 new mode 100755 diff --git a/bin/OpenMetaverse.Http.dll b/bin/OpenMetaverse.Http.dll old mode 100644 new mode 100755 diff --git a/bin/OpenMetaverse.StructuredData.XML b/bin/OpenMetaverse.StructuredData.XML old mode 100644 new mode 100755 diff --git a/bin/OpenMetaverse.StructuredData.dll b/bin/OpenMetaverse.StructuredData.dll old mode 100644 new mode 100755 diff --git a/bin/OpenMetaverse.Utilities.XML b/bin/OpenMetaverse.Utilities.XML old mode 100644 new mode 100755 diff --git a/bin/OpenMetaverse.Utilities.dll b/bin/OpenMetaverse.Utilities.dll old mode 100644 new mode 100755 diff --git a/bin/OpenMetaverse.XML b/bin/OpenMetaverse.XML old mode 100644 new mode 100755 diff --git a/bin/OpenMetaverse.dll b/bin/OpenMetaverse.dll old mode 100644 new mode 100755 diff --git a/bin/OpenMetaverse.dll.config b/bin/OpenMetaverse.dll.config old mode 100644 new mode 100755 diff --git a/bin/OpenMetaverseTypes.XML b/bin/OpenMetaverseTypes.XML old mode 100644 new mode 100755 diff --git a/bin/OpenMetaverseTypes.dll b/bin/OpenMetaverseTypes.dll old mode 100644 new mode 100755 diff --git a/bin/OpenSim.32BitLaunch.exe.config b/bin/OpenSim.32BitLaunch.exe.config old mode 100644 new mode 100755 diff --git a/bin/OpenSim.32BitLaunch.pdb b/bin/OpenSim.32BitLaunch.pdb old mode 100644 new mode 100755 diff --git a/bin/OpenSim.ConsoleClient.exe.config b/bin/OpenSim.ConsoleClient.exe.config old mode 100644 new mode 100755 diff --git a/bin/OpenSim.ConsoleClient.ini.example b/bin/OpenSim.ConsoleClient.ini.example old mode 100644 new mode 100755 diff --git a/bin/OpenSim.Framework.Communications.Tests.dll.config b/bin/OpenSim.Framework.Communications.Tests.dll.config old mode 100644 new mode 100755 diff --git a/bin/OpenSim.Framework.Servers.Tests.dll.config b/bin/OpenSim.Framework.Servers.Tests.dll.config old mode 100644 new mode 100755 diff --git a/bin/OpenSim.Framework.Tests.dll.config b/bin/OpenSim.Framework.Tests.dll.config old mode 100644 new mode 100755 diff --git a/bin/OpenSim.Grid.GridServer.addin.xml b/bin/OpenSim.Grid.GridServer.addin.xml old mode 100644 new mode 100755 diff --git a/bin/OpenSim.Grid.GridServer.exe.config b/bin/OpenSim.Grid.GridServer.exe.config old mode 100644 new mode 100755 diff --git a/bin/OpenSim.Grid.MessagingServer.exe.config b/bin/OpenSim.Grid.MessagingServer.exe.config old mode 100644 new mode 100755 diff --git a/bin/OpenSim.Grid.ScriptServer.exe.config b/bin/OpenSim.Grid.ScriptServer.exe.config old mode 100644 new mode 100755 diff --git a/bin/OpenSim.Grid.UserServer.exe.config b/bin/OpenSim.Grid.UserServer.exe.config old mode 100644 new mode 100755 diff --git a/bin/OpenSim.GridServer.ini.example b/bin/OpenSim.GridServer.ini.example old mode 100644 new mode 100755 diff --git a/bin/OpenSim.Region.CoreModules.Tests.dll.config b/bin/OpenSim.Region.CoreModules.Tests.dll.config old mode 100644 new mode 100755 diff --git a/bin/OpenSim.Region.Framework.Tests.dll.config b/bin/OpenSim.Region.Framework.Tests.dll.config old mode 100644 new mode 100755 diff --git a/bin/OpenSim.Region.ScriptEngine.Tests.dll.config b/bin/OpenSim.Region.ScriptEngine.Tests.dll.config old mode 100644 new mode 100755 diff --git a/bin/OpenSim.Server.exe.config b/bin/OpenSim.Server.exe.config old mode 100644 new mode 100755 diff --git a/bin/OpenSim.Server.ini.example b/bin/OpenSim.Server.ini.example old mode 100644 new mode 100755 diff --git a/bin/OpenSim.Services.exe.config b/bin/OpenSim.Services.exe.config old mode 100644 new mode 100755 diff --git a/bin/OpenSim.addin.xml b/bin/OpenSim.addin.xml old mode 100644 new mode 100755 diff --git a/bin/OpenSim.exe.config b/bin/OpenSim.exe.config old mode 100644 new mode 100755 diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example old mode 100644 new mode 100755 diff --git a/bin/OpenSimExport.exe.config b/bin/OpenSimExport.exe.config old mode 100644 new mode 100755 diff --git a/bin/PhysX-wrapper.dll b/bin/PhysX-wrapper.dll old mode 100644 new mode 100755 diff --git a/bin/PhysX_Wrapper_Dotnet.dll b/bin/PhysX_Wrapper_Dotnet.dll old mode 100644 new mode 100755 diff --git a/bin/PumaCode.SvnDotNet.dll b/bin/PumaCode.SvnDotNet.dll old mode 100644 new mode 100755 diff --git a/bin/RAIL.dll b/bin/RAIL.dll old mode 100644 new mode 100755 diff --git a/bin/RegionConfig.ini.example b/bin/RegionConfig.ini.example old mode 100644 new mode 100755 diff --git a/bin/SimpleApp.exe.config b/bin/SimpleApp.exe.config old mode 100644 new mode 100755 diff --git a/bin/SubversionSharp.dll b/bin/SubversionSharp.dll old mode 100644 new mode 100755 diff --git a/bin/SubversionSharp.pdb b/bin/SubversionSharp.pdb old mode 100644 new mode 100755 diff --git a/bin/System.Data.SQLite.dll b/bin/System.Data.SQLite.dll old mode 100644 new mode 100755 diff --git a/bin/Tools.dll b/bin/Tools.dll old mode 100644 new mode 100755 diff --git a/bin/XMLRPC.dll b/bin/XMLRPC.dll old mode 100644 new mode 100755 diff --git a/bin/avatar-texture.dat b/bin/avatar-texture.dat old mode 100644 new mode 100755 diff --git a/bin/defaultstripe.png b/bin/defaultstripe.png old mode 100644 new mode 100755 diff --git a/bin/excuses b/bin/excuses old mode 100644 new mode 100755 diff --git a/bin/http_404.html.example b/bin/http_404.html.example old mode 100644 new mode 100755 diff --git a/bin/http_500.html.example b/bin/http_500.html.example old mode 100644 new mode 100755 diff --git a/bin/http_loginform.html.example b/bin/http_loginform.html.example old mode 100644 new mode 100755 diff --git a/bin/intl3_svn.dll b/bin/intl3_svn.dll old mode 100644 new mode 100755 diff --git a/bin/libapr.dll b/bin/libapr.dll old mode 100644 new mode 100755 diff --git a/bin/libapr.pdb b/bin/libapr.pdb old mode 100644 new mode 100755 diff --git a/bin/libapriconv.dll b/bin/libapriconv.dll old mode 100644 new mode 100755 diff --git a/bin/libapriconv.pdb b/bin/libapriconv.pdb old mode 100644 new mode 100755 diff --git a/bin/libaprutil.dll b/bin/libaprutil.dll old mode 100644 new mode 100755 diff --git a/bin/libaprutil.pdb b/bin/libaprutil.pdb old mode 100644 new mode 100755 diff --git a/bin/libbulletnet.dll b/bin/libbulletnet.dll old mode 100644 new mode 100755 diff --git a/bin/libbulletnet.so b/bin/libbulletnet.so old mode 100644 new mode 100755 diff --git a/bin/libdb44d.dll b/bin/libdb44d.dll old mode 100644 new mode 100755 diff --git a/bin/libdb_dotNET43.dll b/bin/libdb_dotNET43.dll old mode 100644 new mode 100755 diff --git a/bin/libeay32.dll b/bin/libeay32.dll old mode 100644 new mode 100755 diff --git a/bin/libode-x86_64.so b/bin/libode-x86_64.so old mode 100644 new mode 100755 diff --git a/bin/libode.dylib b/bin/libode.dylib old mode 100644 new mode 100755 diff --git a/bin/libode.so b/bin/libode.so old mode 100644 new mode 100755 diff --git a/bin/libopenjpeg-dotnet-2.1.3.0-dotnet-1-i686.so b/bin/libopenjpeg-dotnet-2.1.3.0-dotnet-1-i686.so old mode 100644 new mode 100755 diff --git a/bin/libopenjpeg-dotnet-2.1.3.0-dotnet-1-x86_64.so b/bin/libopenjpeg-dotnet-2.1.3.0-dotnet-1-x86_64.so old mode 100644 new mode 100755 diff --git a/bin/libopenjpeg-dotnet-2.1.3.0-dotnet-1.dylib b/bin/libopenjpeg-dotnet-2.1.3.0-dotnet-1.dylib old mode 100644 new mode 100755 diff --git a/bin/libopenjpeg-dotnet-2.1.3.0-dotnet-1.so b/bin/libopenjpeg-dotnet-2.1.3.0-dotnet-1.so old mode 100644 new mode 100755 diff --git a/bin/log4net.dll b/bin/log4net.dll old mode 100644 new mode 100755 diff --git a/bin/mssql_connection.ini.example b/bin/mssql_connection.ini.example old mode 100644 new mode 100755 diff --git a/bin/nunit.framework.dll b/bin/nunit.framework.dll old mode 100644 new mode 100755 diff --git a/bin/ode.dll b/bin/ode.dll old mode 100644 new mode 100755 diff --git a/bin/openjpeg-dotnet-x86_64.dll b/bin/openjpeg-dotnet-x86_64.dll old mode 100644 new mode 100755 diff --git a/bin/openjpeg-dotnet.dll b/bin/openjpeg-dotnet.dll old mode 100644 new mode 100755 diff --git a/bin/pCampBot.exe.config b/bin/pCampBot.exe.config old mode 100644 new mode 100755 diff --git a/bin/pCampBotSentences.txt b/bin/pCampBotSentences.txt old mode 100644 new mode 100755 diff --git a/bin/protobuf-net.dll b/bin/protobuf-net.dll old mode 100644 new mode 100755 diff --git a/bin/protobuf-net.pdb b/bin/protobuf-net.pdb old mode 100644 new mode 100755 diff --git a/bin/shutdown_commands.txt b/bin/shutdown_commands.txt old mode 100644 new mode 100755 diff --git a/bin/sqlite-3.4.1.so b/bin/sqlite-3.4.1.so old mode 100644 new mode 100755 diff --git a/bin/sqlite3.dll b/bin/sqlite3.dll old mode 100644 new mode 100755 diff --git a/bin/ssleay32.dll b/bin/ssleay32.dll old mode 100644 new mode 100755 diff --git a/bin/startup_commands.txt.example b/bin/startup_commands.txt.example old mode 100644 new mode 100755 diff --git a/bin/startuplogo.txt b/bin/startuplogo.txt old mode 100644 new mode 100755 diff --git a/bin/svn_client-1.dll b/bin/svn_client-1.dll old mode 100644 new mode 100755 diff --git a/bin/xunit.dll b/bin/xunit.dll old mode 100644 new mode 100755