Changeset 6258

Timestamp:

05/23/11 23:06:53 (14 years ago)

Author:

cneumuel

Message:

#1233

• small cosmetic changes

Location:

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

Files:

• Core.cs (modified) (7 diffs)
• SlaveJob.cs (modified) (2 diffs)

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

@@ -37 +37 @@
   /// </summary>
   public class Core : MarshalByRefObject {
+    public static ILog Log { get; set; }
+    public static bool AbortRequested { get; set; }
+
+    private static HeartbeatManager heartbeatManager;
+    public static HeartbeatManager HeartbeatManager {
+      get { return heartbeatManager; }
+    }
+
     private ISlaveCommunication clientCom;
     private ServiceHost slaveComm;
@@ -42 +50 @@
     private Dictionary<Guid, SlaveJob> slaveJobs = new Dictionary<Guid, SlaveJob>();
     private WcfService wcfService;
-    private static HeartbeatManager heartbeatManager;
-
-    public static HeartbeatManager HBManager { get { return heartbeatManager; } }
-    public static ILog Log { get; set; }
+
     public EventLog ServiceEventLog { get; set; }
-    public static bool abortRequested { get; set; }
     public Dictionary<Guid, SlaveJob> SlaveJobs { get { return slaveJobs; } }
 
@@ -56 +60 @@
     /// </summary>
     public void Start() {
-      abortRequested = false;
+      AbortRequested = false;
 
       try {
@@ -91 +95 @@
       }
       finally {
-        DeRegisterServiceEvents();
+        DeregisterServiceEvents();
         waitShutdownSem.Release();
       }
@@ -106 +110 @@
     private void DispatchMessageQueue() {
       MessageQueue queue = MessageQueue.GetInstance();
-      while (!abortRequested) {
+      while (!AbortRequested) {
         MessageContainer container = queue.GetMessage();
         DetermineAction(container);
-        if (!abortRequested) {
+        if (!AbortRequested) {
           clientCom.StatusChanged(ConfigManager.Instance.GetStatusForClientConsole());
         }
@@ -120 +124 @@
     }
 
-    private void DeRegisterServiceEvents() {
+    private void DeregisterServiceEvents() {
       WcfService.Instance.Connected -= WcfService_Connected;
       WcfService.Instance.ExceptionOccured -= WcfService_ExceptionOccured;
     }
 
-    void WcfService_ExceptionOccured(object sender, EventArgs<Exception> e) {
+    private void WcfService_ExceptionOccured(object sender, EventArgs<Exception> e) {
       clientCom.LogMessage(string.Format("Connection to server interruped with exception: {0}", e.Value.Message));
     }
 
-    void WcfService_Connected(object sender, EventArgs e) {
+    private void WcfService_Connected(object sender, EventArgs e) {
       clientCom.LogMessage("Connected successfully to Hive server");
     }
@@ -346 +350 @@
       clientCom.LogMessage("Stopping heartbeat");
       heartbeatManager.StopHeartBeat();
-      abortRequested = true;
+      AbortRequested = true;
       clientCom.LogMessage("Logging out");
 

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

@@ -175 +175 @@
         finally {
           KillAppDomain();
-          Core.HBManager.AwakeHeartBeatThread();
+          Core.HeartbeatManager.AwakeHeartBeatThread();
         }
       }
@@ -243 +243 @@
         }
       }
-      Core.HBManager.AwakeHeartBeatThread();
+      Core.HeartbeatManager.AwakeHeartBeatThread();
     }