TW-43: Opensync-Gateway

Removed unused files from opensync-gateway Added config into opensync-gateway-static-process Signed-off-by: Mike Hansen <mikehansen@Mikes-MacBook-Pro.local>
2025-11-01 11:07:49 +00:00 · 2020-03-06 11:37:06 -05:00
parent c35a47f51e
commit f752a26a6b
7 changed files with 96 additions and 205 deletions
--- a/opensync-gateway-static-process/src/main/resources/app/certs/httpClientConfig.json
+++ b/opensync-gateway-static-process/src/main/resources/app/certs/httpClientConfig.json
@@ -3,11 +3,11 @@
 "maxConnectionsPerRoute":10,
 "truststoreType":"JKS",
 "truststoreProvider":"SUN",
-"truststoreFile":"file:/app/certs/truststore.jks",
+"truststoreFile":"file:/opt/tip-wlan/certs/truststore.jks",
 "truststorePass":"mypassword",
 "keystoreType":"JKS",
 "keystoreProvider":"SUN",
-"keystoreFile":"file:/app/certs/client_keystore.jks",
+"keystoreFile":"file:/opt/tip-wlan/certs/client_keystore.jks",
 "keystorePass":"mypassword",
 "keyAlias":"clientkeyalias",
 "credentialsList":[
--- a/opensync-gateway-static-process/src/main/resources/app/certs/ssl.properties
+++ b/opensync-gateway-static-process/src/main/resources/app/certs/ssl.properties
@@ -1,11 +1,11 @@
 truststorePass=mypassword
-truststoreFile=file:/app/certs/truststore.jks
+truststoreFile=file:/opt/tip-wlan/certs/truststore.jks
 truststoreType=JKS
 truststoreProvider=SUN

 keyAlias=1
 keystorePass=mypassword
-keystoreFile=file:/app/certs/server.pkcs12
+keystoreFile=file:/opt/tip-wlan/certs/server.pkcs12
 keystoreType=pkcs12
 keystoreProvider=SunJSSE

--- a/opensync-gateway-static-process/src/main/resources/launchers/OpenSyncProcess
+++ b/opensync-gateway-static-process/src/main/resources/launchers/OpenSyncProcess
@@ -1,18 +1,17 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication">
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/opensync_gateway/src/main/java/ai/connectus/opensync/experiment/OpenSyncProcess.java"/>
-</listAttribute>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-<listEntry value="1"/>
-</listAttribute>
-<booleanAttribute key="org.eclipse.jdt.launching.ATTR_EXCLUDE_TEST_CODE" value="true"/>
-<booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_CLASSPATH_ONLY_JAR" value="false"/>
-<booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
-<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.m2e.launchconfig.classpathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/OpenJDK 13.0.2"/>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="com.telecominfraproject.wlan.opensync.experiment.OpenSyncProcess"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="opensync_gateway_static_process"/>
-<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.m2e.launchconfig.sourcepathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dssl.props=file://${connectus_certs}/ssl.properties&#10;-Dwhizcontrol.httpClientConfig=file://${connectus_certs}/httpClientConfig.json&#10;&#10;-D123javax.net.ssl.keyStore=${connectus_certs}/client2Keystore.jks&#10;-D123javax.net.ssl.trustStore=${connectus_certs}/truststore.jks&#10;-Djavax.net.ssl.keyStore=${plume_certs}/plume_client_keystore.jks&#10;-Djavax.net.ssl.trustStore=${plume_certs}/plume_truststore.jks&#10;-Djavax.net.ssl.keyStorePassword=mypassword&#10;-Djavax.net.ssl.trustStorePassword=mypassword&#10;&#10;-Dconnectus.ovsdb.managerAddr=192.168.0.137&#10;-Dconnectus.ovsdb.listenPort=6640&#10;-Dconnectus.ovsdb.redirector.listenPort=6643&#10;-Dconnectus.ovsdb.timeoutSec=30&#10;-D123connectus.ovsdb.trustStore=${connectus_certs}/truststore.jks&#10;-D123connectus.ovsdb.keyStore=${connectus_certs}/server.p12&#10;-Dconnectus.ovsdb.trustStore=${plume_certs}/plume_truststore.jks&#10;-Dconnectus.ovsdb.keyStore=${plume_certs}/opensync_server.pkcs12&#10;&#10;-Dconnectus.ovsdb.configFileName=${project_loc:opensync_ext_static}/src/main/resources/config_2_ssids.json&#10;&#10;-D123connectus.mqttBroker.address=testportal.123wlan.com&#10;-Dconnectus.mqttBroker.address=mqtt.zone1.art2wave.com&#10;-Dconnectus.mqttBroker.listenPort=1883&#10;&#10;-Dspring.profiles.include=ovsdb_redirector,ovsdb_manager&#10;-D123spring.profiles.include=mqtt_receiver,ovsdb_redirector,ovsdb_manager&#10;-D123spring.profiles.include=mqtt_receiver"/>
+    <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
+        <listEntry value="/opensync-gateway/src/main/java/com/telecominfraproject/wlan/opensync/experiment/OpenSyncProcess.java"/>
+    </listAttribute>
+    <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
+        <listEntry value="1"/>
+    </listAttribute>
+    <booleanAttribute key="org.eclipse.jdt.launching.ATTR_EXCLUDE_TEST_CODE" value="true"/>
+    <booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_CLASSPATH_ONLY_JAR" value="false"/>
+    <booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
+    <stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.m2e.launchconfig.classpathProvider"/>
+    <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="com.telecominfraproject.wlan.opensync.experiment.OpenSyncProcess"/>
+    <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="opensync-gateway-static-process"/>
+    <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.m2e.launchconfig.sourcepathProvider"/>
+    <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dssl.props=file://${project_loc:opensync-gateway-static-process}/src/main/resources/app/certs/ssl.properties&#10;-Dwhizcontrol.httpClientConfig=file://${project_loc:opensync-gateway-static-process}/src/main/resources/app/certs/httpClientConfig.json&#10;-Djavax.net.ssl.keyStore=${connectus_certs}/client_keystore.jks&#10;-Djavax.net.ssl.keyStorePassword=mypassword&#10;-Djavax.net.ssl.trustStore=${connectus_certs}/truststore.jks&#10;-Djavax.net.ssl.trustStorePassword=mypassword&#10;&#10;-Dconnectus.ovsdb.managerAddr=${local_server_address}&#10;-Dconnectus.ovsdb.listenPort=6640&#10;-Dconnectus.ovsdb.redirector.listenPort=6643&#10;-Dconnectus.ovsdb.timeoutSec=30&#10;-Dconnectus.ovsdb.trustStore=${connectus_certs}/truststore.jks&#10;-Dconnectus.ovsdb.keyStore=${connectus_certs}/server.pkcs12&#10;&#10;-Dconnectus.ovsdb.configFileName=${project_loc:opensync-ext-static}/src/main/resources/config_2_ssids.json&#10;&#10;-Dconnectus.mqttBroker.address=${local_server_address}&#10;-Dconnectus.mqttBroker.listenPort=1883&#10;-Dspring.profiles.include=mqtt_receiver,ovsdb_redirector,ovsdb_manager"/>
 </launchConfiguration>
--- a/opensync-gateway-static-process/src/main/resources/logback.xml
+++ b/opensync-gateway-static-process/src/main/resources/logback.xml
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- For assistance related to logback-translator or configuration  -->
+<!-- files in general, please contact the logback user mailing list -->
+<!-- at http://www.qos.ch/mailman/listinfo/logback-user             -->
+<!--                                                                -->
+<!-- For professional support please see                            -->
+<!--    http://www.qos.ch/shop/products/professionalSupport         -->
+<!--                                                                -->
+<configuration>
+  <appender name="stdout" class="ch.qos.logback.core.ConsoleAppender">
+    <encoder>
+      <pattern>%d{yyyy-MM-DD HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
+    </encoder>
+  </appender>
+  
+  <!-- 
+  <appender name="FILE" class="ch.qos.logback.core.FileAppender">
+    <file>myApp.log</file>
+
+    <encoder>
+      <pattern>%date %level [%thread] %logger{10} [%file:%line] %msg%n</pattern>
+    </encoder>
+  </appender>
+  -->
+  
+  <appender name="logfile" class="ch.qos.logback.core.rolling.RollingFileAppender">
+    <file>/var/log/a2w/opensyncgw.log</file>
+    <append>true</append>
+    <encoder>
+      <pattern>%date %level [%thread] %logger{36} [%file:%line] %msg%n</pattern>
+    </encoder>
+    <rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
+      <fileNamePattern>/var/log/a2w/opensyncgw.%i.log.gz</fileNamePattern>
+      <minIndex>1</minIndex>
+      <maxIndex>3</maxIndex>
+    </rollingPolicy>
+    <triggeringPolicy class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
+      <maxFileSize>20MB</maxFileSize>
+    </triggeringPolicy>
+  </appender>
+      
+  <!--
+  details: http://logback.qos.ch/manual/configuration.html#auto_configuration
+   
+  runtime configuration, if need to override the defaults: 
+  	-Dlogback.configurationFile=/path/to/logback.xml
+  
+  for log configuration debugging - use 
+  	-Dlogback.statusListenerClass=ch.qos.logback.core.status.OnConsoleStatusListener
+  
+  log levels:
+	OFF ERROR WARN INFO DEBUG TRACE  
+   -->
+  <logger name="org.apache.catalina.startup.DigesterFactory" level="ERROR"/>
+  <logger name="org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping" level="INFO"/>
+  <logger name="org.springframework.boot.context.embedded.tomcat.TomcatEmbeddedServletContainer" level="INFO"/>
+  
+  <logger name="com.telecominfraproject.wlan" level="DEBUG"/>
+  <logger name="ai.connectus" level="DEBUG"/>
+  <logger name="com.netflix.servo.tag.aws.AwsInjectableTag" level="OFF"/>
+  <logger name="com.vmware.ovsdb.service.OvsdbConnectionInfo" level="OFF"/>
+  <logger name="com.vmware.ovsdb.netty.OvsdbConnectionHandler" level="ERROR"/>
+  
+  <logger name="MQTT_DATA" level="DEBUG"/>
+
+  <!--   
+  <logger name="org.springframework.security.web.authentication.preauth" level="DEBUG"/>
+   -->
+   
+  <root level="WARN">
+    <appender-ref ref="stdout"/>
+  	<!-- 
+    <appender-ref ref="logfile"/>
+    -->
+  </root>
+  
+</configuration>