Merge pull request #43 from navicore/master

logging

Author: navicore

src/main/resources/application.conf

@@ -9,22 +9,18 @@ main {
   healthToleranceSeconds = 120
   healthToleranceSeconds = ${?HEALTH_TOLERANCE_SECONDS}
 
-  keyStorePath = "~/secrets/keystore.jks"
-  keyStorePath = ${?KEYSTORE_PATH}
-  keyStorePassword = "mysecret"
-  keyStorePassword = ${?KEYSTORE_PASSWORD}
+  keyStorePath = ${KEYSTORE_PATH}
+  keyStorePassword = ${KEYSTORE_PASSWORD}
 
   mqttTopic = "data"
   mqttTopic = ${?MQTT_TOPIC}
 
-  mqttUrl = "ssl://my.mqtt.host:12345"
   mqttUrl = ${MQTT_URL}
 
   mqttClientId = "dtLabClient"
   mqttClientId = ${?MQTT_CLIENT_ID}
 
-  dtlabIngestUris = "http://localhost:8082/dtlab-alligator/extractor/telemetry/CHANGEME http://localhost:8082/dtlab-alligator/extractor/array/CHANGEME"
-  dtlabIngestUris = ${?DTLAB_INGEST_PATHS}
+  dtlabIngestUris = ${DTLAB_INGEST_PATHS}
 
   telemetryContentType = "json"
   telemetryContentType = ${?TELEMETRY_CONTENT_TYPE}

src/main/scala/somind/dtlab/ingest/mqtt/utils/SslContextUtil.scala

@@ -12,6 +12,7 @@ object SslContextUtil extends LazyLogging {
   def apply(): SSLContext = {
 
     val keyStore = KeyStore.getInstance("pkcs12")
+    logger.info(s"loading keystore from $keyStorePath")
     keyStore.load(new FileInputStream(keyStorePath),
       keyStorePassword.toCharArray)
     val kmf =