lgladsden/jellyfin-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed service stack logging

Browse Source
This commit is contained in:
Luke Pulverenti 2013-12-08 21:24:48 -05:00
parent d7c25fa53f
commit 41ed3c15ff
4 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
MediaBrowser.Mono.userprefs
View File

@ -1,20 +1,24 @@
<Properties>
<MonoDevelop.Ide.Workspace ActiveConfiguration="Debug|x86" />
<MonoDevelop.Ide.Workbench ActiveDocument="MediaBrowser.ServerApplication\ApplicationHost.cs">
<MonoDevelop.Ide.Workbench ActiveDocument="MediaBrowser.Server.Implementations\Library\UserManager.cs">
<Files>
<File FileName="MediaBrowser.Server.Mono\app.config" Line="9" Column="16" />
<File FileName="MediaBrowser.ServerApplication\ApplicationHost.cs" Line="292" Column="4" />
<File FileName="MediaBrowser.Server.Mono\app.config" Line="9" Column="10" />
<File FileName="MediaBrowser.Server.Mono\FFMpeg\FFMpegDownloadInfo.cs" Line="1" Column="1" />
<File FileName="MediaBrowser.Server.Mono\Program.cs" Line="163" Column="51" />
<File FileName="MediaBrowser.Server.Mono\Program.cs" Line="84" Column="7" />
<File FileName="MediaBrowser.Server.Implementations\Library\UserManager.cs" Line="235" Column="10" />
</Files>
<Pads>
<Pad Id="ProjectPad">
<State expanded="True" selected="True">
<State expanded="True">
<Node name="MediaBrowser.Api" expanded="True" />
<Node name="MediaBrowser.Common" expanded="True" />
<Node name="MediaBrowser.Common.Implementations" expanded="True" />
<Node name="MediaBrowser.Controller" expanded="True" />
<Node name="MediaBrowser.Server.Implementations" expanded="True" />
<Node name="MediaBrowser.Server.Implementations" expanded="True">
<Node name="Library" expanded="True">
<Node name="UserManager.cs" selected="True" />
</Node>
</Node>
<Node name="MediaBrowser.Server.Mono" expanded="True">
<Node name="References" expanded="True" />
<Node name="FFMpeg" expanded="True" />
@ -33,6 +37,7 @@
<MonoDevelop.Ide.DebuggingService.Breakpoints>
<BreakpointStore>
<Breakpoint file="D:\Development\MediaBrowser\MediaBrowser.Common.Implementations\HttpClientManager\HttpClientManager.cs" line="477" column="17" />
<Breakpoint file="D:\Development\MediaBrowser\MediaBrowser.Server.Implementations\Library\UserManager.cs" line="222" column="1" />
</BreakpointStore>
</MonoDevelop.Ide.DebuggingService.Breakpoints>
<MonoDevelop.Ide.DebuggingService.PinnedWatches />

5
MediaBrowser.Server.Implementations/HttpServer/HttpListenerHost.cs
View File

@ -63,8 +63,6 @@ namespace MediaBrowser.Server.Implementations.HttpServer
_logger = logManager.GetLogger("HttpServer");
LogManager.LogFactory = new ServerLogFactory(logManager);
_containerAdapter = new ContainerAdapter(applicationHost);
for (var i = 0; i < 2; i++)
@ -477,7 +475,8 @@ namespace MediaBrowser.Server.Implementations.HttpServer
ServiceController = CreateServiceController();
_logger.Info("Calling ServiceStack AppHost.Init");
Init();
base.Init();
}
/// <summary>

3
MediaBrowser.Server.Implementations/HttpServer/ServerFactory.cs
View File

@ -1,6 +1,7 @@
using MediaBrowser.Common;
using MediaBrowser.Controller.Net;
using MediaBrowser.Model.Logging;
using ServiceStack.Logging;
namespace MediaBrowser.Server.Implementations.HttpServer
{
@ -20,6 +21,8 @@ namespace MediaBrowser.Server.Implementations.HttpServer
/// <returns>IHttpServer.</returns>
public static IHttpServer CreateServer(IApplicationHost applicationHost, ILogManager logManager, string serverName, string handlerPath, string defaultRedirectpath)
{
LogManager.LogFactory = new ServerLogFactory(logManager);
return new HttpListenerHost(applicationHost, logManager, serverName, handlerPath, defaultRedirectpath);
}
}

3
MediaBrowser.Server.Mono/MediaBrowser.Server.Mono.csproj
View File

@ -71,6 +71,9 @@
</Compile>
<Compile Include="FFMpeg\FFMpegDownloadInfo.cs" />
<Compile Include="IO\FileSystemFactory.cs" />
<Compile Include="..\MediaBrowser.ServerApplication\EntryPoints\WanAddressEntryPoint.cs">
<Link>EntryPoints\WanAddressEntryPoint.cs</Link>
</Compile>
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<ItemGroup>