Changeset 5093 for branches/HeuristicLab.Hive-3.3/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Console/3.3

Timestamp:

12/13/10 14:13:15 (14 years ago)

Author:

cneumuel

Message:

#1260

• moved all state-information into lifecycleManager
• changed isolation level for transactions to ReadCommited
• made currentlyFetching-status on slave more rubust
• made LogServiceReader more rubust

Location:

branches/HeuristicLab.Hive-3.3/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Console/3.3

Files:

• HeuristicLab.Hive.Slave.Console-3.3.csproj (modified) (2 diffs)
• LogServiceReader.cs (modified) (3 diffs)
• app.config (modified) (2 diffs)

branches/HeuristicLab.Hive-3.3/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Console/3.3/HeuristicLab.Hive.Slave.Console-3.3.csproj

@@ -79 +79 @@
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="HeuristicLab.Clients.Common-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
+      <HintPath>..\..\..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Clients.Common-3.3.dll</HintPath>
+    </Reference>
     <Reference Include="HeuristicLab.Common-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
       <HintPath>..\..\..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Common-3.3.dll</HintPath>
@@ -204 +207 @@
       <Project>{134F93D7-E7C8-4ECD-9923-7F63259A60D8}</Project>
       <Name>HeuristicLab.Hive.Contracts-3.3</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\HeuristicLab.Hive.Slave.Core\3.3\HeuristicLab.Hive.Slave.Core-3.3.csproj">
+      <Project>{5010BD86-23B7-4F8C-888A-76D21AD5266A}</Project>
+      <Name>HeuristicLab.Hive.Slave.Core-3.3</Name>
     </ProjectReference>
   </ItemGroup>

branches/HeuristicLab.Hive-3.3/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Console/3.3/LogServiceReader.cs

@@ -6 +6 @@
 using HeuristicLab.Core;
 using HeuristicLab.Hive.Slave.Console.SlaveConsoleService;
+using HeuristicLab.Clients.Common;
 
 namespace HeuristicLab.Hive.Slave.Console {
@@ -25 +26 @@
     void timer_Tick(object sender, EventArgs e) {
       try {
-        using (var slaveClient = new SlaveConsoleCommunicatorClient()) {
-          var messages = slaveClient.GetLogMessages();
-          if (messages.Count < messageCount) {
-            messageCount = 0; // log got cleared
+        using (var slaveClient = ClientFactory.CreateClient<ISlaveConsoleCommunicator>("SlaveConsoleTcpEndpointClient")) {
+          try {
+            var messages = slaveClient.Obj.GetLogMessages();
+            if (messages.Count < messageCount) {
+              messageCount = 0; // log got cleared
+            }
+            var newMessages = messages.GetRange(messageCount, messages.Count - messageCount);
+            messageCount = messages.Count;
+            OnMoreData(newMessages);
+
           }
-          var newMessages = messages.GetRange(messageCount, messages.Count - messageCount);
-          messageCount = messages.Count;
-          OnMoreData(newMessages);
+          catch (Exception ex) {
+            OnMoreData(new List<string> { "Error fetching log: " + ex.ToString() });
+          }
         }
       }
       catch (Exception ex) {
-        OnMoreData(new List<string> { "Error fetching log: " + ex.ToString() });
+        OnMoreData(new List<string> { "Error in slave-communication: " + ex.ToString() });
       }
     }
@@ -48 +55 @@
       var handler = MoreData;
       var newData = string.Join(Environment.NewLine, newMessages.ToArray());
-      if(newMessages.Count() > 0) newData += Environment.NewLine;
+      if (newMessages.Count() > 0) newData += Environment.NewLine;
       if (handler != null) MoreData(this, newData);
     }

branches/HeuristicLab.Hive-3.3/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Console/3.3/app.config

@@ -16 +16 @@
     <bindings>
       <netTcpBinding>
-        <binding name="SlaveConsoleTcpEndpoint" closeTimeout="00:01:00" openTimeout="00:01:00" receiveTimeout="00:10:00" sendTimeout="00:01:00" transactionFlow="false" transferMode="Buffered" transactionProtocol="OleTransactions" hostNameComparisonMode="StrongWildcard" maxBufferPoolSize="524288" maxBufferSize="65536" maxReceivedMessageSize="104857600">
-          <readerQuotas maxDepth="32" maxStringContentLength="104857600" maxArrayLength="104857600" maxBytesPerRead="104857600" maxNameTableCharCount="104857600"/>
+        <binding name="SlaveConsoleTcpEndpointBinding" closeTimeout="00:01:00" openTimeout="00:01:00" receiveTimeout="00:10:00" sendTimeout="00:01:00" transactionFlow="false" transferMode="Buffered" transactionProtocol="OleTransactions" hostNameComparisonMode="StrongWildcard" maxBufferPoolSize="104857600" maxBufferSize="104857600" maxReceivedMessageSize="104857600">
+          <readerQuotas maxDepth="320" maxStringContentLength="104857600" maxArrayLength="104857600" maxBytesPerRead="104857600" maxNameTableCharCount="104857600"/>
           <reliableSession ordered="true" inactivityTimeout="00:10:00" enabled="false"/>
           <security mode="None">
@@ -27 +27 @@
     </bindings>
     <client>
-      <endpoint address="net.tcp://localhost:8000/SlaveConsoleService" binding="netTcpBinding" bindingConfiguration="SlaveConsoleTcpEndpoint" contract="SlaveConsoleService.ISlaveConsoleCommunicator" name="SlaveConsoleTcpEndpoint"/>
+      <endpoint address="net.tcp://localhost:8000/SlaveConsoleService" binding="netTcpBinding" bindingConfiguration="SlaveConsoleTcpEndpointBinding" contract="SlaveConsoleService.ISlaveConsoleCommunicator" name="SlaveConsoleTcpEndpointClient"/>
     </client>
   </system.serviceModel>