Changeset 4914 for branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Core/3.3/JobStorage/JobStorageManager.cs

Timestamp:

11/23/10 18:22:25 (13 years ago)

Author:

cneumuel

Message:

#1260

• implemented single sign on with services
• fixed plugin-deployment
• removed hive-specific userConfig sections
• minor bugfixes

File:

• branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Core/3.3/JobStorage/JobStorageManager.cs (modified) (1 diff)

branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Core/3.3/JobStorage/JobStorageManager.cs

@@ -61 +61 @@
     public static void CheckAndSubmitJobsFromDisc() {
       for (int index = storedJobsList.Count; index > 0; index--) {
-        if (storedJobsList[index - 1].ServerIP == WcfService.Instance.ServerIp) {
-          String filename = storedJobsList[index - 1].ServerIP + "." + storedJobsList[index - 1].ServerPort + "." + storedJobsList[index - 1].JobID.ToString();
-          Logger.Info("Sending stored job " + storedJobsList[index - 1].JobID + " to the server");
-          try {
-            byte[] job = File.ReadAllBytes(path + filename + ".dat");
-            if (WcfService.Instance.IsJobStillNeeded(storedJobsList[index - 1].JobID).StatusMessage == ResponseStatus.Ok) {
-              ResponseResultReceived res = WcfService.Instance.StoreFinishedJobResultsSync(ConfigManager.Instance.GetClientInfo().Id, storedJobsList[index - 1].JobID, job, TimeSpan.Zero, null, true); // unfortunately we do not have the correct ExecutionTime since we would need to unzip the job for that
-              Logger.Info("Sending of job " + storedJobsList[index - 1].JobID + " done");
-            }
-            SlaveStatusInfo.JobsProcessed++;
-            storedJobsList.Remove(storedJobsList[index - 1]);
-            File.Delete(path + filename + ".dat");
+        String filename = storedJobsList[index - 1].ServerIP + "." + storedJobsList[index - 1].ServerPort + "." + storedJobsList[index - 1].JobID.ToString();
+        Logger.Info("Sending stored job " + storedJobsList[index - 1].JobID + " to the server");
+        try {
+          byte[] job = File.ReadAllBytes(path + filename + ".dat");
+          if (WcfService.Instance.IsJobStillNeeded(storedJobsList[index - 1].JobID).StatusMessage == ResponseStatus.Ok) {
+            ResponseResultReceived res = WcfService.Instance.StoreFinishedJobResultsSync(ConfigManager.Instance.GetClientInfo().Id, storedJobsList[index - 1].JobID, job, TimeSpan.Zero, null, true); // unfortunately we do not have the correct ExecutionTime since we would need to unzip the job for that
+            Logger.Info("Sending of job " + storedJobsList[index - 1].JobID + " done");
           }
-          catch (Exception e) {
-            Logger.Error("Job not on hdd but on list - deleting job from list ", e);
-            storedJobsList.Remove(storedJobsList[index - 1]);
-            StoreJobList();
-          }
+          SlaveStatusInfo.JobsProcessed++;
+          storedJobsList.Remove(storedJobsList[index - 1]);
+          File.Delete(path + filename + ".dat");
+        }
+        catch (Exception e) {
+          Logger.Error("Job not on hdd but on list - deleting job from list ", e);
+          storedJobsList.Remove(storedJobsList[index - 1]);
+          StoreJobList();
         }
       }