Changeset 6263 for branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave/3.4

Timestamp:

05/24/11 14:30:55 (13 years ago)

Author:

ascheibe

Message:

#1233

• added view for displaying jobs
• improved slave ui

Location:

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave/3.4

Files:

• Core.cs (modified) (4 diffs)
• ServiceContracts/ISlaveCommunication.cs (modified) (1 diff)
• SlaveCommunicationService.cs (modified) (2 diffs)

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave/3.4/Core.cs

@@ -84 +84 @@
         if (ServiceEventLog != null) {
           try {
-            ServiceEventLog.WriteEntry(string.Format("Hive Slave threw exception: {0} with stack trace: {1}", ex.ToString(), ex.StackTrace));
+            ServiceEventLog.WriteEntry(string.Format("Hive Slave threw exception: {0} with stack trace: {1}", ex.ToString(), ex.StackTrace), EventLogEntryType.Error);
           }
           catch (Exception) { }
@@ -295 +295 @@
     private void DoAbortAll() {
       lock (slaveJobs) {
-        foreach (SlaveJob sj in slaveJobs.Values) {
+        foreach (SlaveJob sj in new List<SlaveJob>(slaveJobs.Values)) {
           if (!sj.Finished) {
             sj.KillAppDomain();
@@ -311 +311 @@
 
       lock (slaveJobs) {
-        foreach (SlaveJob sj in slaveJobs.Values) {
+        foreach (SlaveJob sj in new List<SlaveJob>(slaveJobs.Values)) {
           if (!sj.Finished) {
             sj.PauseJob();
@@ -326 +326 @@
 
       lock (slaveJobs) {
-        foreach (SlaveJob sj in slaveJobs.Values) {
+        foreach (SlaveJob sj in new List<SlaveJob>(slaveJobs.Values)) {
           if (!sj.Finished) {
             sj.StopJob();

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave/3.4/ServiceContracts/ISlaveCommunication.cs

@@ -28 +28 @@
 
     [OperationContract]
-    bool Subscribe();
+    StatusCommons Subscribe();
 
     [OperationContract]

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave/3.4/SlaveCommunicationService.cs

@@ -30 +30 @@
     private static List<ISlaveCommunicationCallbacks> subscribers = new List<ISlaveCommunicationCallbacks>();
 
-    public bool Subscribe() {
+    public StatusCommons Subscribe() {
       try {
         ISlaveCommunicationCallbacks callback = OperationContext.Current.GetCallbackChannel<ISlaveCommunicationCallbacks>();
@@ -36 +36 @@
           subscribers.Add(callback);
         }
-        return true;
+        return ConfigManager.Instance.GetStatusForClientConsole();
       }
       catch {
-        return false;
+        return null;
       }
     }