Release 1.1.3

Added profile name to system log file. This allows distinct logs when running multiple instances at the same time. Updated run command to pass in active profile via JVM paramter. This resolves issue of "spring.profiles.active_IS_UNDEFINED" in log file name upon initiation. Turned off tomcat by default. Resolved issue when attempting to run multiple instances on the same compute node.
solacese · Nov 20, 2020 · e8e944a · e8e944a
1 parent 0387ad0
commit e8e944a
Show file tree

Hide file tree

Showing 9 changed files with 25 additions and 13 deletions.
diff --git a/README.md b/README.md
@@ -217,7 +217,7 @@ tar zxvf swim-feed-handler-VERSION.tar.gz
 After deployment, run the application using the following command:
 
 ```shell script
-java -jar swim-feed-handler-VERSION.jar --spring.profiles.active=profile-name --spring.config.location=./config/
+java -Dspring.profiles.active=profile-name -Dspring.config.location=./config/ -jar swim-feed-handler-VERSION.jar 
 ```
 
 The value for `profile-name` is based on the which application properties file is desired to be loaded into the 
@@ -227,7 +227,7 @@ of the application, one for each SCDS dataset/Message VPN.  For example, to run
 data, run:
 
  ```shell script
- java -jar swim-feed-handler-VERSION.jar --spring.profiles.active=stdds --spring.config.location=./config/
+ java -Dspring.profiles.active=stdds -Dspring.config.location=./config/ -jar swim-feed-handler-VERSION.jar
  ```
 
  This will invoke the properties found in the `config/application-stdds.properties` file.
@@ -249,10 +249,10 @@ data, run:
  execution.
 
  #### 3.2 Monitor
- Log entries are written to `log/system.log` that indicate current processing actions.  Basic information
+ Log entries are written to `log/system-${profile}.log` that indicate current processing actions.  Basic information
  is provided on execution and should be sufficient to indicate health of the application.  Additional
  debug messages may be turned on by modifying the root log level from `info` to `debug` in the
- `resources/logback.xml` log configuration file.
+ `resources/logback-spring.xml` log configuration file.
 
  ---
 

diff --git a/config/application-fdps.properties b/config/application-fdps.properties
@@ -47,4 +47,6 @@ service.message-logging.header-remove-list=jms*,*JMS*,*Jms*,DEX*,solace*,Solace*
 service.null-op.enabled=false
 
 # Solace logging example:
-logging.level.com.solacesystems=INFO
+logging.level.com.solacesystems=INFO
+
+spring.main.web-application-type=none
diff --git a/config/application-itws.properties b/config/application-itws.properties
@@ -48,4 +48,6 @@ service.message-logging.header-remove-list=jms*,*JMS*,*Jms*,DEX*,solace*,Solace*
 service.null-op.enabled=false
 
 # Solace logging example:
-logging.level.com.solacesystems=INFO
+logging.level.com.solacesystems=INFO
+
+spring.main.web-application-type=none
diff --git a/config/application-notam.properties b/config/application-notam.properties
@@ -48,4 +48,6 @@ service.message-logging.header-remove-list=jms*,*JMS*,*Jms*,DEX*,solace*,Solace*
 service.null-op.enabled=false
 
 # Solace logging example:
-logging.level.com.solacesystems=INFO
+logging.level.com.solacesystems=INFO
+
+spring.main.web-application-type=none
diff --git a/config/application-stdds.properties b/config/application-stdds.properties
@@ -48,4 +48,6 @@ service.message-logging.header-remove-list=jms*,*JMS*,*Jms*,DEX*,solace*,Solace*
 service.null-op.enabled=false
 
 # Solace logging example:
-logging.level.com.solacesystems=INFO
+logging.level.com.solacesystems=INFO
+
+spring.main.web-application-type=none
diff --git a/config/application-tbfm.properties b/config/application-tbfm.properties
@@ -49,4 +49,6 @@ service.message-logging.header-remove-list=jms*,*JMS*,*Jms*,DEX*,solace*,Solace*
 service.null-op.enabled=false
 
 # Solace logging example:
-logging.level.com.solacesystems=INFO
+logging.level.com.solacesystems=INFO
+
+spring.main.web-application-type=none
diff --git a/config/application-tfms.properties b/config/application-tfms.properties
@@ -48,4 +48,6 @@ service.message-logging.header-remove-list=jms*,*JMS*,*Jms*,DEX*,solace*,Solace*
 service.null-op.enabled=false
 
 # Solace logging example:
-logging.level.com.solacesystems=INFO
+logging.level.com.solacesystems=INFO
+
+spring.main.web-application-type=none
diff --git a/pom.xml b/pom.xml
@@ -10,7 +10,7 @@
 	</parent>
 	<groupId>com.solace.swim</groupId>
 	<artifactId>swim-feed-handler</artifactId>
-	<version>1.1.2</version>
+	<version>1.1.3</version>
 	<name>swim-feed-handler</name>
 	<description>SWIM Feed Handler Spring Boot Application</description>
 

diff --git a/src/main/resources/logback.xml → src/main/resources/logback-spring.xml b/src/main/resources/logback.xml → src/main/resources/logback-spring.xml
@@ -4,7 +4,7 @@
     <property name="basePath" value="log/"/>
 
     <appender name="eventLogger" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <file>${basePath}/system.log</file>
+        <file>${basePath}/system-${spring.profiles.active}.log</file>
 
         <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
             <fileNamePattern>log/archived/system-%d{yyyy-MM-dd}.log.%i</fileNamePattern>
@@ -23,7 +23,7 @@
     </appender>
 
     <appender name="hourlyRolloverLogger" class="ch.qos.logback.core.rolling.RollingFileAppender" >
-        <file>${basePath}/messages-${spring.profiles.active}.log</file>
+       <file>${basePath}/messages-${spring.profiles.active}.log</file>
         <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
             <fileNamePattern>${basePath}/messages-${spring.profiles.active}.%d{yyyy-MM-dd_HH, UTC}Z.zip</fileNamePattern>
         </rollingPolicy>