scottk/wlan-cloud-opensync-controller
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/wlan-cloud-opensync-controller.git synced 2025-11-27 15:23:40 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

changed log level for ovsdb client startup messages to info, provided more flexible SSL config for OpensyncMqttClient

Browse Source
This commit is contained in:
Dmitry Toptygin
2020-06-12 21:10:10 -04:00
parent 9b1f79440c
commit 52387b6079
3 changed files with 27 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
opensync-gateway/src/main/java/com/telecominfraproject/wlan/opensync/mqtt/OpensyncMqttClient.java
View File

@@ -64,9 +64,33 @@ public class OpensyncMqttClient implements ApplicationListener<ContextClosedEven
@Value("${connectus.mqttBroker.user:admin}") @Value("${connectus.mqttBroker.user:admin}")
String username, String username,
@Value("${connectus.mqttBroker.password:admin}") @Value("${connectus.mqttBroker.password:admin}")
String password String password,
@Value("${mqtt.javax.net.ssl.keyStore:/opt/tip-wlan/certs/client_keystore.jks}")
String jdkKeyStoreLocation,
@Value("${mqtt.javax.net.ssl.keyStorePassword:mypassword}")
String jdkKeyStorePassword,
@Value("${mqtt.javax.net.ssl.trustStore:/opt/tip-wlan/certs/truststore.jks}")
String jdkTrustStoreLocation,
@Value("${mqtt.javax.net.ssl.trustStorePassword:mypassword}")
String jdkTrustStorePassword
){ ){
if(System.getProperty("javax.net.ssl.keyStore") == null) {
System.setProperty("javax.net.ssl.keyStore", jdkKeyStoreLocation);
}
if(System.getProperty("javax.net.ssl.keyStorePassword") == null) {
System.setProperty("javax.net.ssl.keyStorePassword", jdkKeyStorePassword);
}
if(System.getProperty("javax.net.ssl.trustStore") == null) {
System.setProperty("javax.net.ssl.trustStore", jdkTrustStoreLocation);
}
if(System.getProperty("javax.net.ssl.trustStorePassword") == null) {
System.setProperty("javax.net.ssl.trustStorePassword", jdkTrustStorePassword);
}
Runnable mqttClientRunnable = () -> { Runnable mqttClientRunnable = () -> {
while(keepReconnecting) { while(keepReconnecting) {
BlockingConnection connection = null; BlockingConnection connection = null;

2
opensync-gateway/src/main/java/com/telecominfraproject/wlan/opensync/ovsdb/ConnectusOvsdbClient.java
View File

@@ -174,7 +174,7 @@ public class ConnectusOvsdbClient implements ConnectusOvsdbClientInterface {
listener.startListeningWithSsl(ovsdbListenPort, sslContext, connectionCallback).join(); listener.startListeningWithSsl(ovsdbListenPort, sslContext, connectionCallback).join();
LOG.debug("manager waiting for connection on port {}...", ovsdbListenPort); LOG.info("manager waiting for connection on port {}...", ovsdbListenPort);
} }
private ConnectNodeInfo processConnectRequest(OvsdbClient ovsdbClient, String clientCn, private ConnectNodeInfo processConnectRequest(OvsdbClient ovsdbClient, String clientCn,

2
opensync-gateway/src/main/java/com/telecominfraproject/wlan/opensync/ovsdb/ConnectusOvsdbRedirector.java
View File

@@ -79,7 +79,7 @@ public class ConnectusOvsdbRedirector {
listener.startListeningWithSsl(ovsdbRedirectorListenPort, sslContext, connectionCallback).join(); listener.startListeningWithSsl(ovsdbRedirectorListenPort, sslContext, connectionCallback).join();
LOG.debug("redirector waiting for connection on port {} ...", ovsdbRedirectorListenPort); LOG.info("redirector waiting for connection on port {} ...", ovsdbRedirectorListenPort);
} }