Преглед на файлове

AMBARI-4715 ambari-server fails to start at HTTPS mode (dsen)

Dmitry Sen преди 11 години
родител
ревизия
44f0f2d973
променени са 1 файла, в които са добавени 12 реда и са изтрити 10 реда
  1. 12 10
      ambari-server/src/main/java/org/apache/ambari/server/scheduler/ExecutionScheduleManager.java

+ 12 - 10
ambari-server/src/main/java/org/apache/ambari/server/scheduler/ExecutionScheduleManager.java

@@ -114,21 +114,23 @@ public class ExecutionScheduleManager {
   }
 
   protected void buildApiClient() {
-    if (configuration.getApiSSLAuthentication()) {
-      //TODO build SSL client
-
-    } else {
-      Client client = Client.create();
-
-      this.ambariClient = client;
 
-      String pattern = "http://localhost:%s/";
-      String url = String.format(pattern, configuration.getClientApiPort());
+    Client client = Client.create();
+    this.ambariClient = client;
 
-      this.ambariWebResource = client.resource(url);
+    String pattern;
+    String url;
 
+    if (configuration.getApiSSLAuthentication()) {
+      pattern = "https://localhost:%s/";
+      url = String.format(pattern, configuration.getClientSSLApiPort());
+    } else {
+      pattern = "http://localhost:%s/";
+      url = String.format(pattern, configuration.getClientApiPort());
     }
 
+    this.ambariWebResource = client.resource(url);
+
     //Install auth filters
     ClientFilter csrfFilter = new CsrfProtectionFilter("RequestSchedule");
     ClientFilter tokenFilter = new InternalTokenClientFilter(tokenStorage);