Changeset 6371 for branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave/3.4/WcfService.cs

Timestamp:

06/06/11 18:33:03 (13 years ago)

Author:

ascheibe

Message:

#1233

• code cleanups for slave review
• added switch between privileged and unprivileged sandbox
• removed childjob management because it's not used

File:

• branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave/3.4/WcfService.cs (modified) (8 diffs)

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

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2010 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -29 +29 @@
 
   /// <summary>
-  /// WcfService class is implemented as a Singleton and works as a communication Layer with the Server
+  /// WcfService class is implemented as a singleton and works as a communication layer with the Hive server
   /// </summary>
   public class WcfService : MarshalByRefObject, IPluginProvider {
     private static WcfService instance;
+    public DateTime ConnectedSince { get; private set; }
+    public NetworkEnum.WcfConnState ConnState { get; private set; }
+
     /// <summary>
     /// Getter for the Instance of the WcfService
@@ -48 +51 @@
     }
 
-    public DateTime ConnectedSince { get; private set; }
-    public NetworkEnum.WcfConnState ConnState { get; private set; }
-
     private WcfService() {
       ConnState = NetworkEnum.WcfConnState.Disconnected;
@@ -99 +99 @@
 
     /// <summary>
-    /// Uploads the JobData and sets a new jobState (while correctly setting Transferring state)
+    /// Uploads the jobData and sets a new jobState (while correctly setting Transferring state)
     /// </summary>
     public void UpdateJobData(Job job, JobData jobData, Guid slaveId, JobState state) {
@@ -122 +122 @@
 
     #region Plugin Methods
-
     public Plugin GetPlugin(Guid id) {
       return CallHiveService(s => s.GetPlugin(id));
@@ -152 +151 @@
     #region Helpers
     /// <summary>
-    /// Connects with the Server, registers the events and fires the Connected (and quiet possibly the ConnectionRestored) Event.
+    /// Connects with the server, registers the events and fires the Connected event.
     /// </summary>
     public void Connect(Slave slaveInfo) {
@@ -164 +163 @@
 
     /// <summary>
-    /// Disconnects the Slave from the Server
+    /// Disconnects the slave from the server
     /// </summary>
     public void Disconnect() {
@@ -174 +173 @@
 
     /// <summary>
-    /// Network communication Error Handler - Every network error gets logged and the connection switches to faulted state
-    /// </summary>
-    /// <param name="e">The Exception</param>
+    /// Network communication error handler.
+    /// Every network error gets logged and the connection switches to faulted state
+    /// </summary>
     private void HandleNetworkError(Exception e) {
       ConnState = NetworkEnum.WcfConnState.Failed;