Changeset 1260 for trunk

Timestamp:

03/05/09 17:55:17 (16 years ago)

Author:

kgrading

Message:

updates and extension of the implementation (#493)

Location:

trunk/sources/HeuristicLab.Hive.Client.Core

Files:

• Core.cs (modified) (1 diff)
• JobStorrage/JobStorrageManager.cs (modified) (3 diffs)

trunk/sources/HeuristicLab.Hive.Client.Core/Core.cs

@@ -253 +253 @@
     void wcfService_Connected(object sender, EventArgs e) {
       wcfService.LoginSync(ConfigManager.Instance.GetClientInfo());
+      JobStorrageManager.CheckAndSubmitJobsFromDisc();
     }
 

trunk/sources/HeuristicLab.Hive.Client.Core/JobStorrage/JobStorrageManager.cs

@@ -4 +4 @@
 using System.Text;
 using System.IO;
+using HeuristicLab.Hive.Client.Common;
+using HeuristicLab.Hive.Client.Communication;
 
 namespace HeuristicLab.Hive.Client.Core.JobStorrage {
@@ -10 +12 @@
     
     public static void PersistObjectToDisc(String serverIP, long serverPort, long jobId, byte[] job) {
-      String filename = serverIP + serverPort + jobId.ToString();
+      String filename = serverIP + "." + serverPort + "." + jobId.ToString();
       
       JobStorrageInfo info = new JobStorrageInfo { JobID = jobId, ServerIP = serverIP, ServerPort = serverPort, TimeFinished = DateTime.Now };
       try {
-        Stream jobstream = File.Create("jobStorrage\\"+filename + ".dat");
+        Stream jobstream = File.Create("C:\\Program Files\\HeuristicLab 3.0\\plugins\\jobStorrage\\ "+filename + ".dat");
         jobstream.Write(job, 0, job.Length);
         StoredJobsList.Add(info);
         jobstream.Close();
+        Logging.GetInstance().Info("JobStorrageManager", "Job " + info.JobID + " stored on the harddisc");
       }
       catch (Exception e) {
@@ -23 +26 @@
       }       
     }
+
+    public static void CheckAndSubmitJobsFromDisc() {
+      foreach (JobStorrageInfo info in StoredJobsList) {
+        if (WcfService.Instance.ConnState == NetworkEnum.WcfConnState.Loggedin && (info.ServerIP == WcfService.Instance.ServerIP && info.ServerPort == WcfService.Instance.ServerPort)) {
+          Logging.GetInstance().Info("JobStorrageManager", "Sending stored job " + info.JobID + " to the server");
+        }
+      }
+    }
   }
 }