From 12603a760df8dd70fda06578c49f5cc113bf3712 Mon Sep 17 00:00:00 2001
From: Lombiq <registrator@lombiq.com>
Date: Sat, 16 Aug 2014 20:49:44 +0200
Subject: [PATCH] Also logging the tenant name when an exception is caught from
 background tasks, partially making up for the lack of tenant context when
 such exceptions are logged.

---
 src/Orchard/Tasks/BackgroundService.cs | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/Orchard/Tasks/BackgroundService.cs b/src/Orchard/Tasks/BackgroundService.cs
index 1557a0f56..60d658b39 100644
--- a/src/Orchard/Tasks/BackgroundService.cs
+++ b/src/Orchard/Tasks/BackgroundService.cs
@@ -2,6 +2,7 @@ using System;
 using System.Collections.Generic;
 using JetBrains.Annotations;
 using Orchard.Data;
+using Orchard.Environment.Configuration;
 using Orchard.Logging;
 
 namespace Orchard.Tasks {
@@ -14,10 +15,12 @@ namespace Orchard.Tasks {
     public class BackgroundService : IBackgroundService {
         private readonly IEnumerable<IBackgroundTask> _tasks;
         private readonly ITransactionManager _transactionManager;
+        private readonly string _shellName;
 
-        public BackgroundService(IEnumerable<IBackgroundTask> tasks, ITransactionManager transactionManager) {
+        public BackgroundService(IEnumerable<IBackgroundTask> tasks, ITransactionManager transactionManager, ShellSettings shellSettings) {
             _tasks = tasks;
             _transactionManager = transactionManager;
+            _shellName = shellSettings.Name;
             Logger = NullLogger.Instance;
         }
 
@@ -31,9 +34,8 @@ namespace Orchard.Tasks {
                 }
                 catch (Exception e) {
                     _transactionManager.Cancel();
-                    Logger.Error(e, "Error while processing background task");
+                    Logger.Error(e, "Error while processing background task on tenant '{0}'.", _shellName);
                 }
-                
             }
         }
     }