Changeset 7285


Ignore:
Timestamp:
01/06/12 21:41:16 (8 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:
1 added
2 edited

Legend:

Unmodified
Added
Removed
  • branches/HiveHiveEngine/HeuristicLab.Clients.Hive/3.3/HeuristicLab.Clients.Hive-3.3.csproj

    r7249 r7285  
    119119    <Compile Include="HiveAdminClient.cs" />
    120120    <Compile Include="HiveClient.cs" />
     121    <Compile Include="IHiveEngine.cs" />
    121122    <Compile Include="Settings.Designer.cs">
    122123      <AutoGen>True</AutoGen>
  • branches/HiveHiveEngine/HeuristicLab.Clients.Hive/3.3/HiveClient.cs

    r7259 r7285  
    2222using System;
    2323using System.Collections.Generic;
    24 using System.Configuration;
    2524using System.IO;
    2625using System.Linq;
     
    113112        jobs = null;
    114113        throw;
    115       } finally {
     114      }
     115      finally {
    116116        OnRefreshed();
    117117      }
     
    312312        }
    313313        refreshableJob.Job.Modified = false;
    314       } finally {
     314      }
     315      finally {
    315316        refreshableJob.IsProgressing = false;
    316317      }
     
    321322    /// </summary>
    322323    private static Plugin UploadConfigurationFile(IHiveService service, List<Plugin> onlinePlugins) {
    323       string exeFilePath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, Settings.Default.HLBinaryName);
    324       string configFileName = Path.GetFileName(ConfigurationManager.OpenExeConfiguration(exeFilePath).FilePath);
    325       string configFilePath = ConfigurationManager.OpenExeConfiguration(exeFilePath).FilePath;
     324      string configFilePath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, Settings.Default.HLBinaryName + ".config");
     325      string configFileName = Settings.Default.HLBinaryName + ".config";
    326326      byte[] hash;
    327327
     
    414414          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
    415415        }
    416       } finally {
     416      }
     417      finally {
    417418        if (!semaphoreReleased) taskUploadSemaphore.Release();
    418419      }
     
    465466        }
    466467        refreshableJob.OnLoaded();
    467       } finally {
     468      }
     469      finally {
    468470        refreshableJob.IsProgressing = false;
    469471      }
Note: See TracChangeset for help on using the changeset viewer.