Changeset 4263 for branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Core/3.3/Core.cs

Timestamp:

08/19/10 12:41:05 (14 years ago)

Author:

cneumuel

Message:

consolidated Response objects to use only StatusMessage with enums instead of strings.
removed Success property from Response. success is now represented by StatusMessage alone. (#1159)

File:

• branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Core/3.3/Core.cs (modified) (8 diffs)

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Core/3.3/Core.cs

@@ -47 +47 @@
 using HeuristicLab.Core;
 using System.IO;
+using HeuristicLab.Hive.Contracts.ResponseObjects;
 
 namespace HeuristicLab.Hive.Slave.Core {
@@ -88 +89 @@
       wcfService = WcfService.Instance;
       wcfService.LoginCompleted += new EventHandler<LoginCompletedEventArgs>(wcfService_LoginCompleted);
-      wcfService.SendJobCompleted += new EventHandler<GetJobCompletedEventArgs>(wcfService_GetJobCompleted);
-      wcfService.StoreFinishedJobResultCompleted += new EventHandler<StoreFinishedJobResultCompletedEventArgs>(wcfService_StoreFinishedJobResultCompleted);
+      wcfService.GetJobCompleted += new EventHandler<GetJobCompletedEventArgs>(wcfService_GetJobCompleted);
+      wcfService.GetFinishedJobResultCompleted += new EventHandler<StoreFinishedJobResultCompletedEventArgs>(wcfService_StoreFinishedJobResultCompleted);
       wcfService.ProcessSnapshotCompleted += new EventHandler<ProcessSnapshotCompletedEventArgs>(wcfService_ProcessSnapshotCompleted);
       wcfService.ConnectionRestored += new EventHandler(wcfService_ConnectionRestored);
@@ -153 +154 @@
         case MessageContainer.MessageType.FetchJob:
           if (!CurrentlyFetching) {
-            wcfService.SendJobAsync(ConfigManager.Instance.GetClientInfo().Id);
+            wcfService.GetJobAsync(ConfigManager.Instance.GetClientInfo().Id);
             CurrentlyFetching = true;
           } else
@@ -232 +233 @@
         if (WcfService.Instance.ConnState == NetworkEnum.WcfConnState.Loggedin) {
           Logger.Info("Sending the finished job with id: " + jId);
-          wcfService.StoreFinishedJobResultAsync(ConfigManager.Instance.GetClientInfo().Id, jId, sJob, 1.0, engines[jId].CurrentException, true);
+          wcfService.GetFinishedJobResultAsync(ConfigManager.Instance.GetClientInfo().Id, jId, sJob, 1.0, engines[jId].CurrentException, true);
         } else {
           Logger.Info("Storing the finished job with id: " + jId + " to hdd");
@@ -286 +287 @@
     /// <param name="e"></param>
     void wcfService_LoginCompleted(object sender, LoginCompletedEventArgs e) {
-      if (e.Result.Success) {
+      if (e.Result.StatusMessage == ResponseStatus.Ok) {
         CurrentlyFetching = false;
         Logger.Info("Login completed to Hive Server @ " + DateTime.Now);
       } else
-        Logger.Error("Error during login: " + e.Result.StatusMessage);
+        Logger.Error("Error during login: " + e.Result.StatusMessage.ToString());
     }
 
@@ -299 +300 @@
     /// <param name="e"></param>
     void wcfService_GetJobCompleted(object sender, GetJobCompletedEventArgs e) {
-      if (e.Result.StatusMessage != ApplicationConstants.RESPONSE_COMMUNICATOR_NO_JOBS_LEFT) {
+      if (e.Result.StatusMessage != ResponseStatus.GetJob_NoJobsAvailable) {
         Logger.Info("Received new job with id " + e.Result.Obj.Id);
         bool sandboxed = false;
@@ -355 +356 @@
       Logger.Info("Job submitted with id " + e.Result.JobId);
       KillAppDomain(e.Result.JobId);
-      if (e.Result.Success) {
+      if (e.Result.StatusMessage == ResponseStatus.Ok) {
         SlaveStatusInfo.JobsProcessed++;
         Logger.Info("Increased ProcessedJobs to:" + SlaveStatusInfo.JobsProcessed);
@@ -415 +416 @@
     private void FetchCalendarFromServer() {
       ResponseCalendar calres = wcfService.GetCalendarSync(ConfigManager.Instance.GetClientInfo().Id);
-      if (calres.Success) {
+      if (calres.StatusMessage == ResponseStatus.Ok) {
         if (UptimeManager.Instance.SetAppointments(false, calres)) {
           Logger.Info("Remote calendar installed");