Changeset 841 for trunk/sources

Timestamp:

11/27/08 16:34:46 (16 years ago)

Author:

kgrading

Message:

implemented (#400)

Location:

trunk/sources/HeuristicLab.Hive.Client.Core

Files:

• ConfigurationManager.cs (modified) (3 diffs)
• Core.cs (modified) (3 diffs)

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

@@ -24 +24 @@
 using System.Linq;
 using System.Text;
+using HeuristicLab.Hive.Contracts.BusinessObjects;
 
 namespace HeuristicLab.Hive.Client.Core {
@@ -31 +32 @@
   public class ConfigurationManager {
     private static ConfigurationManager instance = null;
+
+    private ClientInfo clientInfo;
     private Guid guid;
 
@@ -47 +50 @@
       //this won't work this way. We need a plugin for XML Handling.
       guid = Guid.NewGuid();
+      clientInfo = new ClientInfo();
+      clientInfo.ClientId = Guid.NewGuid();
+      clientInfo.NrOfCores = Environment.ProcessorCount;
+      clientInfo.Memory = 1024;
+      clientInfo.Name = Environment.MachineName;
+    }
+
+    public ClientInfo GetClientInfo() {
+      return clientInfo;          
+    }
+
+    public void Loggedin() {
+      if (clientInfo == null) {
+        clientInfo = new ClientInfo();
+      }
+      clientInfo.Login = DateTime.Now;
     }
 

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

@@ -68 +68 @@
 
     public void Start() {
-      Heartbeat beat = new Heartbeat { Interval = 5000 };
-      beat.StartHeartbeat();
-
-      ClientInfo clientInfo = new ClientInfo { ClientId = Guid.NewGuid() };
-
       clientCommunicator = ServiceLocator.GetClientCommunicator();
       clientCommunicator.LoginCompleted += new EventHandler<LoginCompletedEventArgs>(ClientCommunicator_LoginCompleted);
       clientCommunicator.PullJobCompleted += new EventHandler<PullJobCompletedEventArgs>(ClientCommunicator_PullJobCompleted);
       clientCommunicator.SendJobResultCompleted += new EventHandler<SendJobResultCompletedEventArgs>(ClientCommunicator_SendJobResultCompleted);
-      clientCommunicator.LoginAsync(clientInfo);
+      clientCommunicator.LoginAsync(ConfigurationManager.GetInstance().GetClientInfo());
+
+      Heartbeat beat = new Heartbeat { Interval = 5000 };
+      beat.StartHeartbeat();     
 
       MessageQueue queue = MessageQueue.GetInstance();
@@ -91 +89 @@
       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;
@@ -144 +143 @@
       byte[] sJob = engines[jId].GetFinishedJob();
       
-      JobResult jobResult = new JobResult { JobId = jId, Result = sJob, Client = null };
+      JobResult jobResult = new JobResult { JobId = jId, Result = sJob, Client = ConfigurationManager.GetInstance().GetClientInfo() };
       clientCommunicator.SendJobResultAsync(jobResult, true);
     }