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

Timestamp:

08/27/10 11:46:46 (14 years ago)

Author:

cneumuel

Message:

changed Slave.Core WCF-Proxy to stateless object

File:

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

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

@@ -89 +89 @@
       ConnectionContainer cc = ConfigManager.Instance.GetServerIP();
       if (cc.IPAdress != String.Empty) {
-        wcfService.SetIP(cc.IPAdress);
+        wcfService.ServerIp = cc.IPAdress;
       }
     }
@@ -112 +112 @@
       wcfService.ProcessSnapshotCompleted += new EventHandler<ProcessSnapshotCompletedEventArgs>(wcfService_ProcessSnapshotCompleted);
       wcfService.ConnectionRestored += new EventHandler(wcfService_ConnectionRestored);
-      wcfService.ServerChanged += new EventHandler(wcfService_ServerChanged);
+      //wcfService.ServerChanged += new EventHandler(wcfService_ServerChanged);
       wcfService.Connected += new EventHandler(wcfService_Connected);
     }
@@ -121 +121 @@
       wcfService.ProcessSnapshotCompleted -= new EventHandler<ProcessSnapshotCompletedEventArgs>(wcfService_ProcessSnapshotCompleted);
       wcfService.ConnectionRestored -= new EventHandler(wcfService_ConnectionRestored);
-      wcfService.ServerChanged -= new EventHandler(wcfService_ServerChanged);
+      //wcfService.ServerChanged -= new EventHandler(wcfService_ServerChanged);
       wcfService.Connected -= new EventHandler(wcfService_Connected);
     }
@@ -244 +244 @@
         } else {
           Logger.Info("Storing the finished job with id: " + jId + " to hdd");
-          JobStorageManager.PersistObjectToDisc(wcfService.ServerIP, 0, jId, sJob); // [chn] Port is not unique anymore (since we need two ports for http and net.tcp-streaming). also the port is now specified only in app.config. use port 0 for the moment
+          JobStorageManager.PersistObjectToDisc(wcfService.ServerIp, 0, jId, sJob); // [chn] Port is not unique anymore (since we need two ports for http and net.tcp-streaming). also the port is now specified only in app.config. use port 0 for the moment
           KillAppDomain(jId);
         }
@@ -382 +382 @@
     }
 
-    /// <summary>
-    /// The server has been changed. All Appdomains and Jobs must be aborted!
-    /// </summary>
-    /// <param name="sender"></param>
-    /// <param name="e"></param>
-    void wcfService_ServerChanged(object sender, EventArgs e) {
-      Logger.Info("ServerChanged has been called");
-      lock (engines) {
-        foreach (KeyValuePair<Guid, Executor> entries in engines) {
-          engines[entries.Key].Abort();
-          //appDomains[entries.Key].UnhandledException -= new UnhandledExceptionEventHandler(appDomain_UnhandledException);
-          //AppDomain.Unload(appDomains[entries.Key]);
-        }
-        //appDomains = new Dictionary<Guid, AppDomain>();
-        //engines = new Dictionary<Guid, Executor>();
-        //jobs = new Dictionary<Guid, Job>();
-      }
-    }
 
     /// <summary>
@@ -417 +399 @@
       Logger.Info("CalendarAvailable is " + UptimeManager.Instance.CalendarAvailable + " and IsOnline is: " + UptimeManager.Instance.IsAllowedToCalculate());
       Logger.Info("Setting client online");
-      wcfService.LoginSync(ConfigManager.Instance.GetClientInfo());
+      wcfService.Login(ConfigManager.Instance.GetClientInfo());
       JobStorageManager.CheckAndSubmitJobsFromDisc();
       CurrentlyFetching = false;
-      //}
     }