Changeset 1255 for trunk

Timestamp:

03/05/09 15:59:01 (16 years ago)

Author:

kgrading

Message:

added loggedin state for #474

Location:

trunk/sources

Files:

• HeuristicLab.Hive.Client.Common/NetworkEnum.cs (modified) (1 diff)
• HeuristicLab.Hive.Client.Communication/WcfService.cs (modified) (4 diffs)
• HeuristicLab.Hive.Client.Core/Core.cs (modified) (1 diff)
• HeuristicLab.Hive.Client.Core/Heartbeat.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Hive.Client.Common/NetworkEnum.cs

@@ -27 +27 @@
 namespace HeuristicLab.Hive.Client.Common {
   public class NetworkEnum {
-    public enum WcfConnState { Connected, Disconnected, Failed }  
+    public enum WcfConnState { Connected, Disconnected, Failed, Loggedin }  
   }
 }

trunk/sources/HeuristicLab.Hive.Client.Communication/WcfService.cs

@@ -152 +152 @@
         if (ConnState == NetworkEnum.WcfConnState.Connected) {
           Response res = proxy.Login(clientInfo);
+          ConnState = NetworkEnum.WcfConnState.Loggedin;
           Logging.GetInstance().Info(this.ToString(), res.StatusMessage);
         }
@@ -168 +169 @@
     public event System.EventHandler<PullJobCompletedEventArgs> PullJobCompleted;
     public void PullJobAsync(Guid guid) {
-      if (ConnState == NetworkEnum.WcfConnState.Connected)        
+      if (ConnState == NetworkEnum.WcfConnState.Loggedin)        
         proxy.PullJobAsync(guid);
     }
@@ -185 +186 @@
     public event System.EventHandler<SendJobResultCompletedEventArgs> SendJobResultCompleted;
     public void SendJobResultAsync(Guid clientId, long jobId, byte[] result, double percentage, Exception exception, bool finished) {
-      if (ConnState == NetworkEnum.WcfConnState.Connected)
+      if (ConnState == NetworkEnum.WcfConnState.Loggedin)
         proxy.SendJobResultAsync(clientId, jobId, result, percentage, exception, finished);
     }
@@ -204 +205 @@
     public event System.EventHandler<SendHeartBeatCompletedEventArgs> SendHeartBeatCompleted;
     public void SendHeartBeatAsync(HeartBeatData hbd) {
-      if (ConnState == NetworkEnum.WcfConnState.Connected)
+      if (ConnState == NetworkEnum.WcfConnState.Loggedin)
         proxy.SendHeartBeatAsync(hbd);
     }

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

@@ -154 +154 @@
       byte[] sJob = engines[jId].GetFinishedJob();
 
-      if (WcfService.Instance.ConnState == NetworkEnum.WcfConnState.Connected) {
+      if (WcfService.Instance.ConnState == NetworkEnum.WcfConnState.Loggedin) {
         wcfService.SendJobResultAsync(ConfigManager.Instance.GetClientInfo().ClientId,
           jId,

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

@@ -83 +83 @@
       if (wcfService.ConnState == NetworkEnum.WcfConnState.Failed) {
         wcfService.Connect();
-      } else if (wcfService.ConnState == NetworkEnum.WcfConnState.Connected) {
+      } else if (wcfService.ConnState == NetworkEnum.WcfConnState.Loggedin) {
         wcfService.SendHeartBeatAsync(heartBeatData);
       }