Changeset 7285

Timestamp:

01/06/12 21:41:16 (13 years ago)

Author:

ascheibe

Message:

#1744

• added interface for the hive engine so that the parent task can be set which is needed for creating child tasks on the slave
• fixed uploading of the configuration file when executed on the slave

Location:

branches/HiveHiveEngine/HeuristicLab.Clients.Hive/3.3

Files:

• HeuristicLab.Clients.Hive-3.3.csproj (modified) (1 diff)
• HiveClient.cs (modified) (6 diffs)
• IHiveEngine.cs (added)

branches/HiveHiveEngine/HeuristicLab.Clients.Hive/3.3/HeuristicLab.Clients.Hive-3.3.csproj

@@ -119 +119 @@
     <Compile Include="HiveAdminClient.cs" />
     <Compile Include="HiveClient.cs" />
+    <Compile Include="IHiveEngine.cs" />
     <Compile Include="Settings.Designer.cs">
       <AutoGen>True</AutoGen>

branches/HiveHiveEngine/HeuristicLab.Clients.Hive/3.3/HiveClient.cs

@@ -22 +22 @@
 using System;
 using System.Collections.Generic;
-using System.Configuration;
 using System.IO;
 using System.Linq;
@@ -113 +112 @@
         jobs = null;
         throw;
-      } finally {
+      }
+      finally {
         OnRefreshed();
       }
@@ -312 +312 @@
         }
         refreshableJob.Job.Modified = false;
-      } finally {
+      }
+      finally {
         refreshableJob.IsProgressing = false;
       }
@@ -321 +322 @@
     /// </summary>
     private static Plugin UploadConfigurationFile(IHiveService service, List<Plugin> onlinePlugins) {
-      string exeFilePath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, Settings.Default.HLBinaryName);
-      string configFileName = Path.GetFileName(ConfigurationManager.OpenExeConfiguration(exeFilePath).FilePath);
-      string configFilePath = ConfigurationManager.OpenExeConfiguration(exeFilePath).FilePath;
+      string configFilePath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, Settings.Default.HLBinaryName + ".config");
+      string configFileName = Settings.Default.HLBinaryName + ".config";
       byte[] hash;
 
@@ -414 +414 @@
           if (!ae.InnerExceptions.All(e => e is TaskCanceledException)) throw ae; // for some reason the WaitAll throws a AggregateException containg a TaskCanceledException. i don't know where it comes from, however the tasks all finish properly, so for now just ignore it
         }
-      } finally {
+      }
+      finally {
         if (!semaphoreReleased) taskUploadSemaphore.Release();
       }
@@ -465 +466 @@
         }
         refreshableJob.OnLoaded();
-      } finally {
+      }
+      finally {
         refreshableJob.IsProgressing = false;
       }