Protected loggers do not log the class where the method is correctly.

Signed-off-by: Konstantina Chremmou <Konstantina.Chremmou@cloud.com>

XenAdmin/Controls/CheckableDataGridView/CheckableDataGridView.cs

@@ -49,7 +49,7 @@ namespace XenAdmin.Controls.CheckableDataGridView
             public bool RefreshGrid { get; set; }
         }
 
-        protected static readonly log4net.ILog log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
+        private static readonly log4net.ILog log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
         private const string RowUpdatedEventKey = "CheckableDataGridViewRowUpdatedEventKey";
         private const string RowCheckedEventKey = "CheckableDataGridViewRowCheckedEventKey";
 

XenAdmin/Controls/ConsolePanel.cs

@@ -47,7 +47,7 @@ namespace XenAdmin.Controls
         private VNCView activeVNCView;
         private Dictionary<VM, VNCView> vncViews = new Dictionary<VM, VNCView>();
 
-        protected static readonly log4net.ILog log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
+        private static readonly log4net.ILog log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
 
         public ConsolePanel()
         {
@@ -287,6 +287,8 @@ namespace XenAdmin.Controls
 
     internal class CvmConsolePanel : ConsolePanel
     {
+        private static readonly log4net.ILog log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
+
         internal override void SetCurrentSource(Host source)
         {
             if (source == null)

XenAdmin/Wizards/BugToolWizard/BugToolPageDestination.cs

@@ -43,8 +43,7 @@ namespace XenAdmin.Wizards.BugToolWizard
 {
     public partial class BugToolPageDestination : XenTabPage
     {
-        private static readonly log4net.ILog Log =
-            log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod()?.DeclaringType);
+        private static readonly log4net.ILog Log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod()?.DeclaringType);
 
         private bool _buttonNextEnabled;
 

XenAdmin/Wizards/PatchingWizard/AutomatedUpdatesBasePage.cs

@@ -56,7 +56,7 @@ namespace XenAdmin.Wizards.PatchingWizard
         private bool _userMovedVerticalScrollbar;
         private bool _cancelEnabled;
 
-        protected static readonly log4net.ILog log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod()?.DeclaringType);
+        private static readonly log4net.ILog log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod()?.DeclaringType);
         protected List<string> HostsThatWillRequireReboot = new List<string>();
         protected Dictionary<string, List<string>> LivePatchAttempts = new Dictionary<string, List<string>>();
         protected bool ThisPageIsCompleted;

XenAdmin/Wizards/PatchingWizard/PatchingWizard_SelectPatchPage.cs

@@ -44,8 +44,7 @@ namespace XenAdmin.Wizards.PatchingWizard
 {
     public partial class PatchingWizard_SelectPatchPage : XenTabPage
     {
-        private static readonly log4net.ILog log =
-            log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
+        private static readonly log4net.ILog log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
 
         public XenServerPatchAlert AlertFromFileOnDisk;
         public bool FileFromDiskHasUpdateXml { get; private set; }

XenAdmin/Wizards/PatchingWizard/PlanActions/ApplyXenServerPatchPlanAction.cs

@@ -39,6 +39,8 @@ namespace XenAdmin.Wizards.PatchingWizard.PlanActions
 {
     public class ApplyXenServerPatchPlanAction : HostPlanAction
     {
+        private static readonly log4net.ILog log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
+
         private readonly XenServerPatch xenServerPatch;
         private readonly List<HostUpdateMapping> mappings;
 

XenAdmin/Wizards/PatchingWizard/PlanActions/HostPlanAction.cs

@@ -38,6 +38,8 @@ namespace XenAdmin.Wizards.PatchingWizard.PlanActions
 {
     public abstract class HostPlanAction : PlanActionWithSession
     {
+        private static readonly log4net.ILog log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
+
         private readonly Host _currentHost;
         protected readonly XenRef<Host> HostXenRef;
 

XenAdmin/Wizards/PatchingWizard/PlanActions/PatchPrecheckOnHostPlanAction.cs

@@ -42,6 +42,8 @@ namespace XenAdmin.Wizards.PatchingWizard.PlanActions
 {
     class PatchPrecheckOnHostPlanAction : PlanActionWithSession
     {
+        private static readonly log4net.ILog log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
+
         private readonly XenServerPatch xenServerPatch;
         private readonly List<HostUpdateMapping> mappings;
         private readonly Host host;

XenAdmin/Wizards/PatchingWizard/PlanActions/PlanAction.cs

@@ -40,7 +40,7 @@ namespace XenAdmin.Wizards.PatchingWizard.PlanActions
 {
     public abstract class PlanAction : IEquatable<PlanAction>
     {
-        protected static readonly log4net.ILog log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
+        private static readonly log4net.ILog log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
 
         private int _percentComplete;
         public event Action<PlanAction> OnProgressChange;

XenAdmin/Wizards/PatchingWizard/PlanActions/RebootPlanAction.cs

@@ -37,6 +37,8 @@ namespace XenAdmin.Wizards.PatchingWizard.PlanActions
 {
     public abstract class RebootPlanAction : HostPlanAction
     {
+        private static readonly log4net.ILog log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
+
         private bool _cancelled;
         private bool _lostConnection;
         private readonly object _lockObj = new object();

XenAdmin/Wizards/PatchingWizard/PlanActions/RemoveUpdateFilesFromMaster.cs

@@ -39,6 +39,8 @@ namespace XenAdmin.Wizards.PatchingWizard.PlanActions
 {
     class RemoveUpdateFileFromCoordinatorPlanAction : PlanActionWithSession
     {
+        private static readonly log4net.ILog log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
+
         private readonly List<HostUpdateMapping> patchMappings = new List<HostUpdateMapping>();
         private readonly XenServerPatch xenServerPatch;
         private readonly Host coordinator;

XenAdmin/Wizards/PatchingWizard/PlanActions/UploadPatchToCoordinatorPlanAction.cs

@@ -44,6 +44,8 @@ namespace XenAdmin.Wizards.PatchingWizard.PlanActions
 {
     class UploadPatchToCoordinatorPlanAction : PlanActionWithSession
     {
+        private static readonly log4net.ILog log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
+
         private readonly XenServerPatch xenServerPatch;
         private readonly List<HostUpdateMapping> mappings;
         private Dictionary<XenServerPatch, string> AllDownloadedPatches = new Dictionary<XenServerPatch, string>();

XenAdmin/Wizards/RollingUpgradeWizard/PlanActions/RpuUploadAndApplySuppPackPlanAction.cs

@@ -46,6 +46,8 @@ namespace XenAdmin.Wizards.RollingUpgradeWizard.PlanActions
 {
     class RpuUploadAndApplySuppPackPlanAction : HostPlanAction
     {
+        private static readonly log4net.ILog log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
+
         private Host host;
         private List<Host> hosts;
         private string suppPackPath;

XenAdmin/Wizards/RollingUpgradeWizard/PlanActions/UpgradeHostPlanAction.cs

@@ -39,6 +39,8 @@ namespace XenAdmin.Wizards.RollingUpgradeWizard.PlanActions
 {
     public class UpgradeAutomatedHostPlanAction : UpgradeHostPlanAction
     {
+        private static readonly log4net.ILog log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
+
         private readonly Dictionary<string, string> _arguments;
 
         public UpgradeAutomatedHostPlanAction(Host host, Control invokingControl, Dictionary<string, string> arguments)

XenAdmin/Wizards/RollingUpgradeWizard/PlanActions/UpgradeManualHostPlanAction.cs

@@ -42,6 +42,8 @@ namespace XenAdmin.Wizards.RollingUpgradeWizard.PlanActions
 {
     public abstract class UpgradeHostPlanAction : RebootPlanAction
     {
+        private static readonly log4net.ILog log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
+
         protected bool rebooting;
         private readonly Timer timer;
         protected readonly Control invokingControl;

XenAdmin/Wizards/RollingUpgradeWizard/RollingUpgradeUpgradePage.cs

@@ -41,6 +41,8 @@ namespace XenAdmin.Wizards.RollingUpgradeWizard
 {
     public partial class RollingUpgradeUpgradePage : AutomatedUpdatesBasePage
     {
+        private static readonly log4net.ILog log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
+
         public RollingUpgradeUpgradePage()
         {
             InitializeComponent();

XenOvfApi/Package.cs

@@ -214,6 +214,8 @@ namespace XenOvf
     /// </summary>
     internal class TarPackage : Package
     {
+        private static readonly log4net.ILog log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
+
         private readonly Dictionary<string, byte[]> _DirectoryCache = new Dictionary<string, byte[]>();
         private string _DescriptorFileName;
 
@@ -424,7 +426,7 @@ namespace XenOvf
     /// </summary>
     public abstract class Package
     {
-        protected static readonly log4net.ILog log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
+        private static readonly log4net.ILog log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
 
         public const string MANIFEST_EXT = ".mf";
         public const string CERTIFICATE_EXT = ".cert";