Merge branch 'main' into 1-memory-leak-and-sqs-throttling

.gitignore

@@ -21,3 +21,4 @@ creds.txt
 cws-test/newCWSDir
 
 .DS_Store
+install/logging/logstash-6.4.2.zip

README.md

@@ -17,10 +17,12 @@ See the [wiki](https://github.com/NASA-AMMOS/common-workflow-service/wiki) for m
   - Mariadb or mysql database set up on either your local machine or a remote host. You will also need to create the following:
     - A database for CWS to use. `cws` is a good default.
     - A database user with full access to the above database.
-  - ITerm2: Currently these build scripts include commands to open new terminal windows using ITerm2, so they are best run from that terminal.
-  - Logstash: You will need to place the logstash 6.4.2 zip in `install/logging/`. This is a temporary workaround while we clean up our installation process. You can find the zip download [here](https://www.elastic.co/downloads/past-releases/logstash-6-4-2).
-
-> **Note:** You will need to add your own Tomcat keystore and truststore to the `install/` directory for the CWS web console to work properly. See https://tomcat.apache.org/tomcat-9.0-doc/ssl-howto.html.
+  - [ITerm2](https://iterm2.com/): Currently these build scripts include commands to open new terminal windows using ITerm2, so they are best run from that terminal.
+  - **Logstash**: You will need to place the logstash 6.4.2 zip in `install/logging/`. This is a temporary workaround while we clean up our installation process. You can find the zip download [here](https://www.elastic.co/downloads/past-releases/logstash-6-4-2).
+  - Tomcat **keystore and truststore files** (needed for CWS web console to work properly):
+    - You will need to add your own Tomcat keystore file to the `install/` direcotory
+    - You will need to add your own truststor file to the `install/tomcat_lib/` directory
+    - See: https://tomcat.apache.org/tomcat-9.0-doc/ssl-howto.html
 
 ## Building CWS
 

cws-service/src/main/java/jpl/cws/process/initiation/InitiatorsService.java

@@ -609,12 +609,13 @@ private void refreshInitiators(String contextXmlResource) throws Exception {
 
 	}
 
-
-	public void disableAndStopInitiator(String initiatorId) throws Exception {
+	// Synchronized to prevent race conditions in refreshing the spring context
+	public synchronized void disableAndStopInitiator(String initiatorId) throws Exception {
 		disableAndStopInitiator(cwsConsoleService.getProcessInitiatorById(initiatorId));
 	}
-
-	public void enableAndStartInitiator(String initiatorId) throws Exception {
+
+	// Synchronized to prevent race conditions in refreshing the spring context
+	public synchronized void enableAndStartInitiator(String initiatorId) throws Exception {
 		enableAndStartInitiator(cwsConsoleService.getProcessInitiatorById(initiatorId));
 	}
 

pom.xml

@@ -22,7 +22,7 @@
 	<properties>
 		<activemq.version>5.14.5</activemq.version>
 		<activeio-core.version>3.1.4</activeio-core.version>
-		<software.amazon.awssdk.version>2.15.27</software.amazon.awssdk.version>
+		<software.amazon.awssdk.version>2.15.47</software.amazon.awssdk.version>
 		<!-- <boon.version>0.12</boon.version> -->
 		<camunda.version>7.13.0</camunda.version>
 		<commons-compress.version>1.5</commons-compress.version>