Changeset 2591 for trunk/sources/HeuristicLab.Tracing

Timestamp:

01/05/10 10:31:40 (15 years ago)

Author:

gkronber

Message:

Copied refactored plugin infrastructure from branch and merged changeset r2586:2589 from branch into the trunk. #799

Location:

trunk/sources/HeuristicLab.Tracing/3.2

Files:

• HeuristicLabTracingPlugin.cs (modified) (1 diff)
• HiveLogger.cs (modified) (4 diffs)
• Logger.cs (modified) (4 diffs)

trunk/sources/HeuristicLab.Tracing/3.2/HeuristicLabTracingPlugin.cs

@@ -3 +3 @@
 namespace HeuristicLab.Tracing {
 
-  [ClassInfo(Name = "HeuristicLab.Tracing-3.2")]
-  [PluginFile(Filename = "HeuristicLab.Tracing-3.2.dll", Filetype = PluginFileType.Assembly)]
-  [PluginFile(Filename = "log4net.dll", Filetype = PluginFileType.Assembly)]
-  [PluginFile(Filename = "log4net licence.txt", Filetype = PluginFileType.License)]
-  [PluginFile(Filename = "HeuristicLab.log4net.xml", Filetype = PluginFileType.Data)]
+  [Plugin("HeuristicLab.Tracing-3.2")]
+  [PluginFile("HeuristicLab.Tracing-3.2.dll", PluginFileType.Assembly)]
+  [PluginFile("log4net.dll", PluginFileType.Assembly)]
+  [PluginFile("log4net licence.txt", PluginFileType.License)]
+  [PluginFile("HeuristicLab.log4net.xml", PluginFileType.Data)]
   public class HeuristicLabPersistencePlugin : PluginBase {}
 

trunk/sources/HeuristicLab.Tracing/3.2/HiveLogger.cs

@@ -14 +14 @@
       if (string.IsNullOrEmpty(Settings.Default.TracingLog4netConfigFile)) {
         Settings.Default.TracingLog4netConfigFile =
-          Path.Combine(
-            PluginInfrastructure.Properties.Settings.Default.PluginDir,
-            "HeuristicLab.Hive.log4net.xml");
+            "HeuristicLab.Hive.log4net.xml";
       }
       XmlConfigurator.ConfigureAndWatch(
@@ -26 +24 @@
       Configure();
       StackFrame frame = new StackFrame(nParents + 1);
-      return LogManager.GetLogger(frame.GetMethod().DeclaringType);      
+      return LogManager.GetLogger(frame.GetMethod().DeclaringType);
     }
 
@@ -47 +45 @@
     }
 
-    public static void Error(object message) {      
+    public static void Error(object message) {
       GetDefaultLogger(1).Error(message);
     }
@@ -62 +60 @@
     public static void Info(Type type, object message) {
       Configure();
-      LogManager.GetLogger(type).Info(message);      
+      LogManager.GetLogger(type).Info(message);
     }
 
     public static void Warn(Type type, object message) {
       Configure();
-      LogManager.GetLogger(type).Warn(message);      
+      LogManager.GetLogger(type).Warn(message);
     }
 

trunk/sources/HeuristicLab.Tracing/3.2/Logger.cs

@@ -13 +13 @@
 
     protected static void Configure() {
-      if ( IsConfigured ) return;
+      if (IsConfigured) return;
       IsConfigured = true;
       if (string.IsNullOrEmpty(Settings.Default.TracingLog4netConfigFile)) {
-        Settings.Default.TracingLog4netConfigFile = 
-          Path.Combine(
-            PluginInfrastructure.Properties.Settings.Default.PluginDir,
-            "HeuristicLab.log4net.xml");
+        Settings.Default.TracingLog4netConfigFile =
+            "HeuristicLab.log4net.xml";
       }
       XmlConfigurator.ConfigureAndWatch(
@@ -29 +27 @@
       Configure();
       StackFrame frame = new StackFrame(nParents + 1);
-      return LogManager.GetLogger(frame.GetMethod().DeclaringType);      
+      return LogManager.GetLogger(frame.GetMethod().DeclaringType);
     }
 
@@ -50 +48 @@
     }
 
-    public static void Error(object message) {      
+    public static void Error(object message) {
       GetDefaultLogger(1).Error(message);
     }
@@ -65 +63 @@
     public static void Info(Type type, object message) {
       Configure();
-      LogManager.GetLogger(type).Info(message);      
+      LogManager.GetLogger(type).Info(message);
     }
 
     public static void Warn(Type type, object message) {
       Configure();
-      LogManager.GetLogger(type).Warn(message);      
+      LogManager.GetLogger(type).Warn(message);
     }