Changeset 13171

Timestamp:

11/16/15 13:38:30 (9 years ago)

Author:

ascheibe

Message:

#2496 merged r13060 into stable

Location:

stable

Files:

• . (modified) (1 prop)
• HeuristicLab.Clients.Hive.JobManager/3.3/Views/HiveJobManagerView.cs (modified) (2 diffs)
• HeuristicLab.Clients.Hive/3.3/HiveServiceLocator.cs (modified) (2 diffs)
• HeuristicLab.Clients.Hive/3.3/IHiveServiceLocator.cs (modified) (1 diff)

stable/HeuristicLab.Clients.Hive.JobManager/3.3/Views/HiveJobManagerView.cs

@@ -107 +107 @@
       } else {
         if (ex is MessageSecurityException) {
-          MessageBox.Show("A Message Security error has occured. This normally means that your user name or password is wrong.", "HeuristicLab Hive Job Manager", MessageBoxButtons.OK, MessageBoxIcon.Error);
+          string message =
+            "A Message Security error has occured. This normally means that your user name or password is wrong. Detailed information: " + Environment.NewLine;
+          message += HiveServiceLocator.Instance.GetEndpointInformation();
+          ErrorHandling.ShowErrorDialog(this, message, ex);
         } else if (ex is AnonymousUserException) {
           using (HiveInformationDialog dialog = new HiveInformationDialog()) {
@@ -113 +116 @@
           }
         } else {
-          ErrorHandling.ShowErrorDialog(this, "Refresh failed.", ex);
+          ErrorHandling.ShowErrorDialog(this,
+            "Refresh failed. Detailed information: " + Environment.NewLine + HiveServiceLocator.Instance.GetEndpointInformation(), ex);
         }
       }

stable/HeuristicLab.Clients.Hive/3.3/HiveServiceLocator.cs

@@ -36 +36 @@
     }
 
-    private HiveServiceLocator() {
-    }
+    private HiveServiceLocator() { }
 
     private string username;
@@ -54 +53 @@
 
     public string WorkingEndpoint { get; private set; }
+
+
+    public string GetEndpointInformation() {
+      string message = "Configured endpoints: " + Environment.NewLine;
+
+      var configurations = Settings.Default.EndpointConfigurationPriorities;
+      foreach (var endpointConfigurationName in configurations) {
+        var cl = ClientFactory.CreateClient<HiveServiceClient, IHiveService>(endpointConfigurationName);
+        message += endpointConfigurationName + ": " + cl.Endpoint.Address + Environment.NewLine;
+      }
+
+      if (string.IsNullOrEmpty(WorkingEndpoint)) {
+        message += "No working endpoint found, check you configuration.";
+      } else {
+        message += "Used endpoint: " + WorkingEndpoint;
+      }
+
+      return message;
+    }
 
     private HiveServiceClient NewServiceClient() {

stable/HeuristicLab.Clients.Hive/3.3/IHiveServiceLocator.cs

@@ -28 +28 @@
     void CallHiveService(Action<IHiveService> call);
     T CallHiveService<T>(Func<IHiveService, T> call);
+
+    string GetEndpointInformation();
   }
 }