Changeset 4772 for branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Console/3.3/ServiceLocator.cs

Timestamp:

11/11/10 15:30:03 (13 years ago)

Author:

cneumuel

Message:

#1260

• added LogServiceReader to display log for slave without writing to local files
• aborted jobs with childjobs now got back to state WaitForChildJob (instead of Offline)
• lifecyclemanager now knows about available plugins (does not yet work perfectly)

File:

• branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Console/3.3/ServiceLocator.cs (modified) (2 diffs)

branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Console/3.3/ServiceLocator.cs

@@ -9 +9 @@
     private static IServerConsoleFacade serverConsoleFacade = null;
 
-    internal static string Address { get; set; }
     internal static string Username { get; set; }
     internal static string Password { get; set; } // [chn] TODO: Don't store plaintext password in memory!
@@ -22 +21 @@
 
     internal static IServerConsoleFacade GetServerConsoleFacade() {
-      if (serverConsoleFacade == null && Address != String.Empty) {
+      if (serverConsoleFacade == null) {
         ChannelFactory<IServerConsoleFacade> factory = new ChannelFactory<IServerConsoleFacade>("ServerConsoleHttpEndpoint");
-        WcfSettings.SetEndpointAddress(factory.Endpoint, Address);
+        //WcfSettings.SetEndpointAddress(factory.Endpoint, Address);
 
         factory.Credentials.UserName.UserName = Username;