Changeset 1775 for trunk/sources/HeuristicLab.Hive.Client.Core/3.2/JobStorage

Timestamp:

05/08/09 14:55:56 (16 years ago)

Author:

kgrading

Message:

fixed small changes in logging, messagequeues and the jobfetching (#467)

File:

• trunk/sources/HeuristicLab.Hive.Client.Core/3.2/JobStorage/JobStorageManager.cs (modified) (5 diffs)

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

@@ -9 +9 @@
 using HeuristicLab.Hive.Contracts;
 using System.Xml.Serialization;
+using System.Diagnostics;
 
 namespace HeuristicLab.Hive.Client.Core.JobStorage {
@@ -16 +17 @@
     //Todo: execution path
     //Todo: Choose a better directory name 
-    private static String path = "C:\\Program Files\\HeuristicLab 3.0\\plugins\\jobStorrage\\";
+    private static String path = "C:\\Program Files\\HeuristicLab 3.0\\plugins\\Hive.Client.Jobs\\";
     
     public static void PersistObjectToDisc(String serverIP, long serverPort, Guid jobId, byte[] job) {
@@ -30 +31 @@
         jobstream.Write(job, 0, job.Length);
         storedJobsList.Add(info);
-        Logging.Instance.Info("JobStorageManager", "Job " + info.JobID + " stored on the harddisc");
+        Debug.WriteLine("Job " + info.JobID + " stored on the harddisc");
+        //Logging.Instance.Info("JobStorageManager", "Job " + info.JobID + " stored on the harddisc");
       }
       catch (Exception e) {
@@ -48 +50 @@
         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");
+          Debug.WriteLine("Sending stored job " + storedJobsList[index - 1].JobID + " to the server");
+          //Logging.Instance.Info("JobStorrageManager", "Sending stored job " + storedJobsList[index - 1].JobID + " to the server");
           byte[] job = File.ReadAllBytes(path + filename + ".dat");
           
           //Todo: ask server first if he really wants the job...
           ResponseResultReceived res = WcfService.Instance.SendStoredJobResultsSync(ConfigManager.Instance.GetClientInfo().Id, storedJobsList[index-1].JobID, job, 1.00, null, true);
+          ClientStatusInfo.JobsProcessed++;
           //TODO: has to be fixed from server side
           //if (res.Success == true) {
-          Logging.Instance.Info("JobStorrageManager", "Sending of job " + storedJobsList[index - 1].JobID + " done");  
+          Debug.WriteLine("Sending of job " + storedJobsList[index - 1].JobID + " done");  
+          //Logging.Instance.Info("JobStorrageManager", "Sending of job " + storedJobsList[index - 1].JobID + " done");  
+
           storedJobsList.Remove(storedJobsList[index - 1]);
           File.Delete(path + filename + ".dat");
@@ -66 +72 @@
     public static void StoreJobList() {
       XmlSerializer serializer = new XmlSerializer(typeof(List<JobStorageInfo>));
-      TextWriter writer = new StreamWriter(path + "list.xml");
+      TextWriter writer = new StreamWriter(Path.Combine(path ,"list.xml"));
       serializer.Serialize(writer, storedJobsList);
+      writer.Close();
     }