Changeset 2107

Timestamp:

06/25/09 16:47:43 (15 years ago)

Author:

kgrading

Message:

various updates (#467)

Location:

trunk/sources

Files:

• HeuristicLab.Hive.Client.Communication/3.2/WcfService.cs (modified) (2 diffs)
• HeuristicLab.Hive.Client.Core/3.2/ConfigurationManager/ConfigManager.cs (modified) (2 diffs)
• HeuristicLab.Hive.Client.Core/3.2/JobStorage/JobStorageManager.cs (modified) (5 diffs)
• HeuristicLab.Hive.Client.ExecutionEngine/3.2/Executor.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.Hive.Client.Communication/3.2/WcfService.cs

@@ -252 +252 @@
     
     #endregion
-
+                                                 
     /// <summary>
     /// Methods for sending the periodically Heartbeat
@@ -268 +268 @@
         SendHeartBeatCompleted(sender, e);
       else {
-        Logging.Instance.Error(this.ToString(), "Error: " + e.Result.StatusMessage);
+        try {
+          Logging.Instance.Error(this.ToString(), "Error: " + e.Result.StatusMessage);
+        } catch (Exception ex) {
+          Logging.Instance.Error(this.ToString(), "Error: ", ex);          
+        }
         HandleNetworkError(e.Error);
       }

trunk/sources/HeuristicLab.Hive.Client.Core/3.2/ConfigurationManager/ConfigManager.cs

@@ -29 +29 @@
 using HeuristicLab.Hive.Client.Communication;
 using HeuristicLab.Hive.Client.Core.Properties;
+using HeuristicLab.Hive.Contracts;
 
 namespace HeuristicLab.Hive.Client.Core.ConfigurationManager {
@@ -129 +130 @@
         foreach (KeyValuePair<Guid, Executor> kvp in engines) {
           Executor e = kvp.Value;
-          prog[e.JobId] = e.Progress;
+          if (!e.Running && e.CurrentMessage == MessageContainer.MessageType.NoMessage) 
+            prog[e.JobId] = e.Progress;
         }
       }

trunk/sources/HeuristicLab.Hive.Client.Core/3.2/JobStorage/JobStorageManager.cs

@@ -46 +46 @@
         if (WcfService.Instance.ConnState == NetworkEnum.WcfConnState.Loggedin && (storedJobsList[index-1].ServerIP == WcfService.Instance.ServerIP && storedJobsList[index-1].ServerPort == WcfService.Instance.ServerPort)) {
           String filename = storedJobsList[index-1].ServerIP + "." + storedJobsList[index-1].ServerPort + "." + storedJobsList[index-1].JobID.ToString();          
-          Logging.Instance.Info("JobStorrageManager", "Sending stored job " + storedJobsList[index - 1].JobID + " to the server");
+          Logging.Instance.Info("JobStorageManager", "Sending stored job " + storedJobsList[index - 1].JobID + " to the server");
           try {
             byte[] job = File.ReadAllBytes(path + filename + ".dat");
@@ -54 +54 @@
                 Logging.Instance.Error("JobStorageManager", "sending of job failed: " + res.StatusMessage);
               else
-                Logging.Instance.Info("JobStorrageManager", "Sending of job " + storedJobsList[index - 1].JobID + " done");
+                Logging.Instance.Info("JobStorageManager", "Sending of job " + storedJobsList[index - 1].JobID + " done");
             }
             ClientStatusInfo.JobsProcessed++;
@@ -61 +61 @@
           }
           catch (Exception e) {
-            Logging.Instance.Error("JobStorrageManager", "Job not on hdd but on list - deleting job from list", e);
+            Logging.Instance.Error("JobStorageManager", "Job not on hdd but on list - deleting job from list", e);
             storedJobsList.Remove(storedJobsList[index - 1]);
           }
@@ -77 +77 @@
 
     static JobStorageManager() {
-      Logging.Instance.Info("JobStorrageManager", "Restoring Joblist from Harddisk");
+      Logging.Instance.Info("JobStorageManager", "Restoring Joblist from Harddisk");
       if (!Directory.Exists(path))
         Directory.CreateDirectory(path);
@@ -87 +87 @@
           XmlTextReader reader = new XmlTextReader(stream);
           storedJobsList = (List<JobStorageInfo>)serializer.Deserialize(reader);
-          Logging.Instance.Info("JobStorrageManager", "Loaded " + storedJobsList.Count + " Elements");
+          Logging.Instance.Info("JobStorageManager", "Loaded " + storedJobsList.Count + " Elements");
         }
         catch (Exception e) {
-          Logging.Instance.Error("JobStorrageManager", "Exception while loading the Stored Job List", e);
+          Logging.Instance.Error("JobStorageManager", "Exception while loading the Stored Job List", e);
         }
       } else {
-        Logging.Instance.Info("JobStorrageManager", "no stored jobs on harddisk, starting new list");
+        Logging.Instance.Info("JobStorageManager", "no stored jobs on harddisk, starting new list");
         storedJobsList = new List<JobStorageInfo>();
       }

trunk/sources/HeuristicLab.Hive.Client.ExecutionEngine/3.2/Executor.cs

@@ -38 +38 @@
     public MessageContainer.MessageType CurrentMessage { get; set; }
     public MessageQueue Queue { get; set; }
+    
     public bool Running {
       get {
@@ -43 +44 @@
       }
     }
+
     public double Progress {
       get {