WIP

spotify · Aug 26, 2015 · fc1b4c1 · fc1b4c1
1 parent 418633f
commit fc1b4c1
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/helios-services/src/main/java/com/spotify/helios/master/MasterMain.java b/helios-services/src/main/java/com/spotify/helios/master/MasterMain.java
@@ -68,7 +68,7 @@ public MasterMain(final CuratorClientFactory curatorClientFactory,
   @Override
   protected void startUp() throws Exception {
     service = new MasterService(masterConfig, createEnvironment("helios-master"),
-        curatorClientFactory);
+                                curatorClientFactory);
     service.startAsync().awaitRunning();
   }
 

diff --git a/helios-services/src/main/java/com/spotify/helios/master/MasterService.java b/helios-services/src/main/java/com/spotify/helios/master/MasterService.java
@@ -269,8 +269,8 @@ protected void startUp() throws Exception {
     }
 
     final ServiceRegistration serviceRegistration = ServiceRegistration.newBuilder()
-        .endpoint("helios", "http", config.getUriEndpoint().getPort(),
-            config.getDomain(), config.getName())
+        .endpoint("helios", config.getUriEndpoint().getScheme(), config.getUriEndpoint().getPort(),
+                  config.getDomain(), config.getName())
         .build();
     registrar.register(serviceRegistration);
   }

diff --git a/helios-services/src/main/java/com/spotify/helios/servicescommon/ServiceUtil.java b/helios-services/src/main/java/com/spotify/helios/servicescommon/ServiceUtil.java
@@ -56,7 +56,9 @@ public static DefaultServerFactory createServerFactory(final URI endpoint,
       final String adminEndpointScheme = adminEndpoint.getScheme();
       final HttpConnectorFactory adminConnector = getServiceConnector(adminEndpointScheme);
       adminConnector.setPort(adminEndpoint.getPort());
-      serviceConnector.setBindHost(adminEndpoint.getHost());
+      // bind host should be taken from endpoint.getHost() above. But how to pass in admin endpoint scheme?
+//      serviceConnector.setBindHost(adminEndpoint.getHost());
+//      ((HttpsConnectorFactory) adminConnector).setKeyStorePath("path to key store");
       serverFactory.setAdminConnectors(ImmutableList.<ConnectorFactory>of(adminConnector));
     }