Changeset 4772 for branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HiveWeb/App_Code/HiveServerModule.cs

Timestamp:

11/11/10 15:30:03 (13 years ago)

Author:

cneumuel

Message:

#1260

• added LogServiceReader to display log for slave without writing to local files
• aborted jobs with childjobs now got back to state WaitForChildJob (instead of Offline)
• lifecyclemanager now knows about available plugins (does not yet work perfectly)

File:

• branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HiveWeb/App_Code/HiveServerModule.cs (modified) (2 diffs)

branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HiveWeb/App_Code/HiveServerModule.cs

@@ -9 +9 @@
 using HeuristicLab.Hive.Contracts.Interfaces;
 using HeuristicLab.PluginInfrastructure;
+using HeuristicLab.PluginInfrastructure.Manager;
 
 namespace HeuristicLab.Hive.Server.Core.IISModules {
@@ -14 +15 @@
     private static object locker = new object();
     private static ILifecycleManager lifecycleManager;
-    
+    private static PluginManager pm;
+
     public void Init(HttpApplication context) {
       lock (locker) {
-        if(lifecycleManager == null) lifecycleManager = ServiceLocator.GetLifecycleManager();
-        lifecycleManager.Start();
+        if (lifecycleManager == null) {
+          pm = new PluginManager(@"C:\ch\SVN\branches\HeuristicLab.Hive\sources\HeuristicLab.Hive\HiveWeb\App_Data\Plugins\");
+          pm.DiscoverAndCheckPlugins();
+          pm.InitializeLifetimeService();
+
+          lifecycleManager = ServiceLocator.GetLifecycleManager();
+          lifecycleManager.Plugins = pm.Plugins;
+          lifecycleManager.Start();
+        }
       }
     }