Changeset 6998 for trunk

Timestamp:

11/16/11 13:52:11 (13 years ago)

Author:

ascheibe

Message:

#1672 Changed again how plugin discovery works because of Hive. The reason is that it must be possible to move the plugin and working directories away from the original slave working directory. This is needed for the Slave App and also in the future for the windows service because we don't want it to run as the LocalSystem user.
I have removed setting the PrivateBinPath and am now setting the ApplicationBase. This doesn't effect HL (because ApplicationBase is set by default to pluginDir anyway) but makes Hive work. The reason why setting the PrivateBinPath doesn't work with moving plugin and working directories is (from msdn): "Private assemblies are deployed in the same directory structure as the application. If the directories specified for PrivateBinPath are not under ApplicationBase, they are ignored."

Location:

trunk/sources

Files:

• HeuristicLab.Clients.Hive.Slave/3.3/Core.cs (modified) (1 diff)
• HeuristicLab.PluginInfrastructure/3.3/Manager/PluginManager.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.Clients.Hive.Slave/3.3/Core.cs

@@ -406 +406 @@
     #region Log Events
     private void log_MessageAdded(object sender, EventArgs<string> e) {
-      clientCom.LogMessage(e.Value.Split('\t')[1]);
+      try {
+        clientCom.LogMessage(e.Value.Split('\t')[1]);
+      }
+      catch { }
     }
     #endregion

trunk/sources/HeuristicLab.PluginInfrastructure/3.3/Manager/PluginManager.cs

@@ -74 +74 @@
       OnInitializing(PluginInfrastructureEventArgs.Empty);
       AppDomainSetup setup = AppDomain.CurrentDomain.SetupInformation;
-      setup.PrivateBinPath = pluginDir;
-      // probing should only occur in PrivateBinPath (not in ApplicationBase). This is enforced by the value string.Empty
-      setup.PrivateBinPathProbe = string.Empty;
+      setup.ApplicationBase = pluginDir;
       AppDomain pluginDomain = null;
       try {
@@ -207 +205 @@
     /// </summary>
     /// <returns><c>null</c>.</returns>
-    [SecurityPermission(SecurityAction.LinkDemand, Flags=SecurityPermissionFlag.Infrastructure)]
+    [SecurityPermission(SecurityAction.LinkDemand, Flags = SecurityPermissionFlag.Infrastructure)]
     public override object InitializeLifetimeService() {
       return null;