Merge branch 'master' of git://github.com/kayone/NzbDrone

pull/4/head
Mark McDowall 14 years ago
commit 020283225b

@ -56,10 +56,10 @@ namespace NzbDrone.Core
{ {
BindKernel(); BindKernel();
LogConfiguration.StartDbLogging();
MigrationsHelper.Run(Connection.MainConnectionString, true); MigrationsHelper.Run(Connection.MainConnectionString, true);
LogConfiguration.StartDbLogging();
_kernel.Get<QualityProvider>().SetupDefaultProfiles(); _kernel.Get<QualityProvider>().SetupDefaultProfiles();
BindExternalNotifications(); BindExternalNotifications();

@ -191,12 +191,12 @@ namespace NzbDrone.Core.Providers.Jobs
{ {
do do
{ {
Tuple<Type, int> job = null;
using (NestedDiagnosticsContext.Push(Guid.NewGuid().ToString())) using (NestedDiagnosticsContext.Push(Guid.NewGuid().ToString()))
{ {
try try
{ {
Tuple<Type, int> job = null;
lock (Queue) lock (Queue)
{ {
if (Queue.Count != 0) if (Queue.Count != 0)

Loading…
Cancel
Save