allow env vars for k8s

jameshnsears · Feb 13, 2019 · b470fd4 · b470fd4
1 parent 96b3891
commit b470fd4
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 4 deletions.
diff --git a/src/main/java/xqa/XqaQueryBalancerApplication.java b/src/main/java/xqa/XqaQueryBalancerApplication.java
@@ -12,6 +12,8 @@
 import io.dropwizard.jdbi3.JdbiFactory;
 import io.dropwizard.setup.Bootstrap;
 import io.dropwizard.setup.Environment;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import xqa.health.QueryBalancerHealthCheck;
 import xqa.resources.SearchResource;
 import xqa.resources.XQueryResource;
@@ -20,6 +22,7 @@
 import javax.servlet.FilterRegistration;
 
 public class XqaQueryBalancerApplication extends Application<XqaQueryBalancerConfiguration> {
+    private static final Logger LOGGER = LoggerFactory.getLogger(XqaQueryBalancerApplication.class);
     private final String serviceId;
 
     public XqaQueryBalancerApplication() {
@@ -54,6 +57,8 @@ public void run(final XqaQueryBalancerConfiguration configuration, final Environ
         environment.healthChecks().register("QueryBalancerHealthCheck", new QueryBalancerHealthCheck());
 
         final JdbiFactory factory = new JdbiFactory();
+        LOGGER.info(String.format("databaseUrl=%s", configuration.getDataSourceFactory().getUrl()));
+
         final Jdbi jdbi = factory.build(environment, configuration.getDataSourceFactory(), "postgresql");
 
         environment.jersey().register(new SearchResource(jdbi));

diff --git a/src/main/java/xqa/resources/XQueryResource.java b/src/main/java/xqa/resources/XQueryResource.java
@@ -62,6 +62,8 @@ public XQueryResource(final MessageBrokerConfiguration messageBrokerConfiguratio
         synchronized (this) {
             this.serviceId = serviceId;
 
+            LOGGER.info(String.format("messageBrokerHost=%s", messageBrokerConfiguration.getHost()));
+
             messageBroker = new MessageBroker(messageBrokerConfiguration.getHost(), messageBrokerConfiguration.getPort(),
                     messageBrokerConfiguration.getUserName(), messageBrokerConfiguration.getPassword(),
                     messageBrokerConfiguration.getRetryAttempts());

diff --git a/xqa-query-balancer.dev.yml b/xqa-query-balancer.dev.yml
@@ -10,7 +10,7 @@ database:
   driverClass: org.postgresql.Driver
   user: xqa
   password: xqa
-  url: jdbc:postgresql://0.0.0.0:5432/xqa
+  url: ${databaseUrl:- jdbc:postgresql://0.0.0.0:5432/xqa}
   properties:
     charSet: UTF-8
   maxWaitForConnection: 5s
@@ -32,7 +32,7 @@ logging:
     - type: console
 
 messageBroker:
-  host: 0.0.0.0
+  host: ${messageBrokerHost:- 0.0.0.0}
   port: 5672
   userName: admin
   password: admin

diff --git a/xqa-query-balancer.yml b/xqa-query-balancer.yml
@@ -10,7 +10,7 @@ database:
   driverClass: org.postgresql.Driver
   user: xqa
   password: xqa
-  url: jdbc:postgresql://xqa-db:5432/xqa
+  url: ${databaseUrl:- jdbc:postgresql://xqa-db:5432/xqa}
   properties:
     charSet: UTF-8
   maxWaitForConnection: 5s
@@ -32,7 +32,7 @@ logging:
     - type: console
 
 messageBroker:
-  host: xqa-message-broker
+  host: ${messageBrokerHost:- xqa-message-broker}
   port: 5672
   userName: admin
   password: admin