Changeset 932 for trunk/sources/HeuristicLab.Hive.Client.Core/Core.cs

Timestamp:

12/10/08 11:15:47 (16 years ago)

Author:

kgrading

Message:

implementation for #425

File:

• trunk/sources/HeuristicLab.Hive.Client.Core/Core.cs (modified) (7 diffs)

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

@@ -40 +40 @@
 using System.ServiceModel.Description;
 using HeuristicLab.Hive.Client.Core.ClientConsoleService;
+using HeuristicLab.Hive.Client.Core.ConfigurationManager;
 
 
@@ -57 +58 @@
       server.StartClientConsoleServer(new Uri("net.tcp://127.0.0.1:8000/ClientConsole/"));
 
-      ConfigurationManager manager = ConfigurationManager.GetInstance();
+      ConfigManager manager = ConfigManager.Instance;
       manager.Core = this;
 
       wcfService = WcfService.Instance;
-      wcfService.Connect("192.168.132.1", "9000");
+      wcfService.Connect("10.20.53.1", 9000);
 
       wcfService.LoginCompleted += new EventHandler<LoginCompletedEventArgs>(wcfService_LoginCompleted);
@@ -67 +68 @@
       wcfService.SendJobResultCompleted += new EventHandler<SendJobResultCompletedEventArgs>(wcfService_SendJobResultCompleted);
       wcfService.ConnectionRestored += new EventHandler(wcfService_ConnectionRestored);
+      wcfService.ServerChanged += new EventHandler(wcfService_ServerChanged);
 
-      wcfService.LoginAsync(ConfigurationManager.GetInstance().GetClientInfo());
+      wcfService.LoginAsync(ConfigManager.Instance.GetClientInfo());
 
       Heartbeat beat = new Heartbeat { Interval = 10000 };
@@ -115 +117 @@
       byte[] sJob = engines[jId].GetFinishedJob();
       
-      JobResult jobResult = new JobResult { JobId = jId, Result = sJob, Client = ConfigurationManager.GetInstance().GetClientInfo() };
+      JobResult jobResult = new JobResult { JobId = jId, Result = sJob, Client = ConfigManager.Instance.GetClientInfo() };
       wcfService.SendJobResultAsync(jobResult, true);
     }
@@ -135 +137 @@
       if (e.Result.Success) {
         Logging.GetInstance().Info(this.ToString(), "Login completed to Hive Server @ " + DateTime.Now);
-        ConfigurationManager.GetInstance().Loggedin();
-        Status.LoginTime = DateTime.Now;
-        Status.LoggedIn = true;
+        ConfigManager.Instance.Loggedin();        
       } else
         Logging.GetInstance().Error(this.ToString(), e.Result.StatusMessage);
@@ -156 +156 @@
       engines.Add(e.Result.JobId, engine);
 
-      Status.CurrentJobs++;
+      ClientStatusInfo.JobsFetched++;
 
-      Debug.WriteLine("Increment CurrentJobs to:"+Status.CurrentJobs.ToString());
+      Debug.WriteLine("Increment FetchedJobs to:"+ClientStatusInfo.JobsFetched);
     }
 
@@ -166 +166 @@
         appDomains.Remove(e.Result.JobId);
         engines.Remove(e.Result.JobId);
-        Status.CurrentJobs--;
-        Debug.WriteLine("Decrement CurrentJobs to:" + Status.CurrentJobs.ToString());
+        ClientStatusInfo.JobsProcessed++;
+        Debug.WriteLine("ProcessedJobs to:" + ClientStatusInfo.JobsProcessed);
       } else {
         Debug.WriteLine("Job sending FAILED!");
       }
     }
+
+    void wcfService_ServerChanged(object sender, EventArgs e) {
+      foreach(KeyValuePair<long, AppDomain> entries in appDomains)
+        AppDomain.Unload(appDomains[entries.Key]);
+      appDomains = new Dictionary<long, AppDomain>();
+      engines = new Dictionary<long, Executor>();
+    }
+
 
     #endregion