Changeset 4810 for branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Console

Timestamp:

11/16/10 14:31:52 (14 years ago)

Author:

cneumuel

Message:

#1260

• changed dependency discovery machanism: now all locally loaded plugins will be dependencies for a job.
• fixed logging of slaveconsole by limiting the maximum log-messages
• minor bug fixes.

Location:

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

Files:

• HiveSlaveConsole.cs (modified) (2 diffs)
• LogServiceReader.cs (modified) (2 diffs)
• app.config (modified) (1 diff)

branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Console/3.3/HiveSlaveConsole.cs

@@ -104 +104 @@
     private void InitLogFileReader() {
       //logFileReader = new LogFileReader(AppDomain.CurrentDomain.BaseDirectory + @"/Hive.Slave.log");
-      logFileReader = new LogServiceReader(slaveCommunicator);
+      logFileReader = new LogServiceReader();
       logFileReader.MoreData += new MoreDataHandler(logFileReader_MoreData);
       logFileReader.Start();
@@ -524 +524 @@
         isfired = true;
         refreshTimer.Stop();
-        DialogResult res = MessageBox.Show(body, caption, MessageBoxButtons.OK, MessageBoxIcon.Error);
+        
+        DialogResult res;
+        if (e != null) {
+          res = MessageBox.Show(body + "\n" + e.Message + ": " + e.StackTrace, caption, MessageBoxButtons.OK, MessageBoxIcon.Error);
+        } else {
+          res = MessageBox.Show(body + " (no exception available)", caption, MessageBoxButtons.OK, MessageBoxIcon.Error);
+        }
         if (res == DialogResult.OK)
           this.Close();

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

@@ -5 +5 @@
 using System.Windows.Forms;
 using HeuristicLab.Core;
+using HeuristicLab.Hive.Slave.Console.SlaveConsoleService;
 
 namespace HeuristicLab.Hive.Slave.Console {
   internal class LogServiceReader : ILogReader {
 
-    private SlaveConsoleService.SlaveConsoleCommunicatorClient slaveCommunicator;
     private Timer timer;
     private int messageCount = 0;
 
-    public LogServiceReader(SlaveConsoleService.SlaveConsoleCommunicatorClient slaveCommunicator) {
-      this.slaveCommunicator = slaveCommunicator;
+    public LogServiceReader() {
     }
 
@@ -26 +25 @@
     void timer_Tick(object sender, EventArgs e) {
       try {
-        var messages = slaveCommunicator.GetLogMessages();
-        var newMessages = messages.GetRange(messageCount, messages.Count - messageCount);
-        messageCount = messages.Count;
-        OnMoreData(newMessages);
+        using (var slaveClient = new SlaveConsoleCommunicatorClient()) {
+          var messages = slaveClient.GetLogMessages();
+          if (messages.Count < messageCount) {
+            messageCount = 0; // log got cleared
+          }
+          var newMessages = messages.GetRange(messageCount, messages.Count - messageCount);
+          messageCount = messages.Count;
+          OnMoreData(newMessages);
+        }
       }
       catch { }

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

@@ -17 +17 @@
       <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="65536">
-          <readerQuotas maxDepth="32" maxStringContentLength="8192" maxArrayLength="16384" maxBytesPerRead="4096" maxNameTableCharCount="16384"/>
+          <readerQuotas maxDepth="32" maxStringContentLength="104857600" maxArrayLength="104857600" maxBytesPerRead="104857600" maxNameTableCharCount="104857600"/>
           <reliableSession ordered="true" inactivityTimeout="00:10:00" enabled="false"/>
           <security mode="None">