Changeset 7213 for branches/HeuristicLab.TimeSeries/HeuristicLab.Clients.Hive.Slave/3.3/Manager

Timestamp:

12/20/11 11:45:18 (13 years ago)

Author:

gkronber

Message:

#1081 merged r7103:7209 from trunk into time series branch

Location:

branches/HeuristicLab.TimeSeries

Files:

• . (modified) (1 prop)
• HeuristicLab.Clients.Hive.Slave/3.3/Manager/ConfigManager.cs (modified) (1 diff)
• HeuristicLab.Clients.Hive.Slave/3.3/Manager/HeartbeatManager.cs (modified) (4 diffs)

branches/HeuristicLab.TimeSeries/HeuristicLab.Clients.Hive.Slave/3.3/Manager/ConfigManager.cs

@@ -125 +125 @@
       }
       catch (Exception ex) {
-        SlaveClientCom.Instance.ClientCom.LogMessage(string.Format("Exception was thrown while trying to get execution times: {0}", ex.Message));
+        SlaveClientCom.Instance.LogMessage(string.Format("Exception was thrown while trying to get execution times: {0}", ex.Message));
       }
       return prog;

branches/HeuristicLab.TimeSeries/HeuristicLab.Clients.Hive.Slave/3.3/Manager/HeartbeatManager.cs

@@ -82 +82 @@
     private void RunHeartBeatThread() {
       while (!threadStopped) {
-        SlaveClientCom.Instance.ClientCom.StatusChanged(ConfigManager.Instance.GetStatusForClientConsole());
+        try {
+          SlaveClientCom.Instance.StatusChanged(ConfigManager.Instance.GetStatusForClientConsole());
+        }
+        catch (Exception ex) {
+          EventLogManager.LogMessage("Couldn't sent status information to client ui. Exception is: " + Environment.NewLine + ex.ToString());
+        }
 
         try {
@@ -104 +109 @@
               };
 
-              SlaveClientCom.Instance.ClientCom.LogMessage("Send HB: " + heartBeatData);
+              SlaveClientCom.Instance.LogMessage("Send HB: " + heartBeatData);
               List<MessageContainer> msgs = wcfService.SendHeartbeat(heartBeatData);
 
               if (msgs == null) {
-                SlaveClientCom.Instance.ClientCom.LogMessage("Error getting response from HB");
+                SlaveClientCom.Instance.LogMessage("Error getting response from HB");
                 OnExceptionOccured(new Exception("Error getting response from HB"));
               } else {
-                SlaveClientCom.Instance.ClientCom.LogMessage("HB Response received (" + msgs.Count + "): ");
-                msgs.ForEach(mc => SlaveClientCom.Instance.ClientCom.LogMessage(mc.Message.ToString()));
+                SlaveClientCom.Instance.LogMessage("HB Response received (" + msgs.Count + "): ");
+                msgs.ForEach(mc => SlaveClientCom.Instance.LogMessage(mc.Message.ToString()));
                 msgs.ForEach(mc => MessageQueue.GetInstance().AddMessage(mc));
               }
@@ -119 +124 @@
         }
         catch (Exception e) {
-          SlaveClientCom.Instance.ClientCom.LogMessage("Heartbeat thread failed: " + e.ToString());
+          SlaveClientCom.Instance.LogMessage("Heartbeat thread failed: " + e.ToString());
           OnExceptionOccured(e);
         }
@@ -125 +130 @@
       }
       waitHandle.Close();
-      SlaveClientCom.Instance.ClientCom.LogMessage("Heartbeat thread stopped");
+      SlaveClientCom.Instance.LogMessage("Heartbeat thread stopped");
     }