Changeset 5711 for branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave

Timestamp:

03/16/11 14:12:30 (14 years ago)

Author:

ascheibe

Message:

#1233

• use SlaveComm Endpoint from app.config
• various further slave bugfixes/cleanups
• added preliminary icon for hive slave ui and some slave ui improvements
• added resource deletion to admin ui
• fix service exception thrown if there is no EventLog

Location:

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave/3.4

Files:

• ConfigManager.cs (modified) (1 diff)
• HeuristicLab.Clients.Hive.Slave-3.4.csproj (modified) (1 diff)
• Logger.cs (deleted)
• SlaveClientCom.cs (modified) (1 diff)
• app_ascheibe.config (modified) (1 diff)
• app_f005pc.config (modified) (1 diff)
• app_services.config (modified) (1 diff)

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave/3.4/ConfigManager.cs

@@ -240 +240 @@
 
     public static int GetFreeMemory() {
-      PerformanceCounter counter = new PerformanceCounter("Memory", "Available Bytes", true);
-      int mb = (int)(counter.NextValue() / 1024 / 1024);
+      int mb = 0;
+
+      try {
+        PerformanceCounter counter = new PerformanceCounter("Memory", "Available Bytes", true);
+        mb = (int)(counter.NextValue() / 1024 / 1024);
+      }
+      catch { }
       return mb;
     }

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave/3.4/HeuristicLab.Clients.Hive.Slave-3.4.csproj

@@ -105 +105 @@
     <Compile Include="InvalidStateException.cs" />
     <Compile Include="JobStatus.cs" />
-    <Compile Include="Logger.cs">
-      <SubType>Code</SubType>
-    </Compile>
     <Compile Include="MessageQueue.cs" />
     <Compile Include="NetworkEnum.cs" />

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave/3.4/SlaveClientCom.cs

@@ -52 +52 @@
     private void SetupClientCom() {
       DummyListener dummy = new DummyListener();
-      pipeFactory = new DuplexChannelFactory<ISlaveCommunication>(
-        dummy, new NetNamedPipeBinding(), new EndpointAddress("net.pipe://localhost/HeuristicLabSlaveCom"));
+      pipeFactory = new DuplexChannelFactory<ISlaveCommunication>(dummy, "SlaveCommunicationServiceEndpoint");
       ISlaveCommunication pipeProxy = pipeFactory.CreateChannel();
       ClientCom = pipeProxy;

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave/3.4/app_ascheibe.config

@@ -33 +33 @@
     </services>
     <client>
+      <endpoint name="SlaveCommunicationServiceEndpoint" address="net.pipe://localhost/HeuristicLabSlaveCom" binding="netNamedPipeBinding" contract="HeuristicLab.Clients.Hive.SlaveCore.ServiceContracts.ISlaveCommunication"/>
       <endpoint address="http://services.heuristiclab.com/Hive-3.4/HiveService.svc" binding="wsHttpBinding" bindingConfiguration="wsHttpBinding" contract="HeuristicLab.Clients.Hive.IHiveService" name="wsHttpBinding_IHiveService">
         <identity>

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave/3.4/app_f005pc.config

@@ -33 +33 @@
     </services>
     <client>
+      <endpoint name="SlaveCommunicationServiceEndpoint" address="net.pipe://localhost/HeuristicLabSlaveCom" binding="netNamedPipeBinding" contract="HeuristicLab.Clients.Hive.SlaveCore.ServiceContracts.ISlaveCommunication"/>
       <endpoint address="http://localhost/Hive-3.4/HiveService.svc" binding="wsHttpBinding" bindingConfiguration="wsHttpBinding" contract="HeuristicLab.Clients.Hive.IHiveService" name="wsHttpBinding_IHiveService">
         <identity>

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave/3.4/app_services.config

@@ -33 +33 @@
     </services>
     <client>
+      <endpoint name="SlaveCommunicationServiceEndpoint" address="net.pipe://localhost/HeuristicLabSlaveCom" binding="netNamedPipeBinding" contract="HeuristicLab.Clients.Hive.SlaveCore.ServiceContracts.ISlaveCommunication"/>
       <endpoint address="http://services.heuristiclab.com/Hive-3.4/HiveService.svc" binding="wsHttpBinding" bindingConfiguration="wsHttpBinding" contract="HeuristicLab.Clients.Hive.IHiveService" name="wsHttpBinding_IHiveService">
         <identity>