HOTFIX: Close channel after submitting via EventSinkService (#215)

* Close channel after submitting via EventSinkService

* Add a null check, report error if no channels

* Update CHANGELOG.md

* remove duplicate requirement

Co-authored-by: Rob Kooper <[email protected]>

Author: bodom0015

CHANGELOG.md

@@ -6,6 +6,9 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ## 1.17.0 - 2021-04-29
 
+### Fixed
+- Close channel after submitting via RabbitMQMessageService
+
 ### Added
 - Endpoint `/api/datasets/createfrombag` to ingest datasets in BagIt format. Includes basic dataset metadata, files,
   folders and technical metadata. Downloading datasets now includes extra Datacite and Clowder metadata.

app/services/rabbitmq/RabbitMQMessageService.scala

@@ -231,15 +231,26 @@ class RabbitMQMessageService extends MessageService {
   /** Submit a message to broker. */
   override def submit(exchange: String, routing_key: String, message: JsValue, exchange_type: String = "topic") = {
     connect()
-    val tempChannel = connection.get.createChannel()
-    tempChannel.exchangeDeclare(exchange, exchange_type, true)
-    
-    // If a routing_key (queue name) was provided, ensure that the queue exists
-    if (routing_key != "") {
-      tempChannel.queueDeclare(routing_key, true, false, false, null)
-      tempChannel.queueBind(routing_key, exchange, routing_key)
+    var tempChannel: Channel = null
+    try {
+      tempChannel = connection.get.createChannel()
+      if (tempChannel != null) {
+        tempChannel.exchangeDeclare(exchange, exchange_type, true)
+
+        // If a routing_key (queue name) was provided, ensure that the queue exists
+        if (routing_key != "") {
+          tempChannel.queueDeclare(routing_key, true, false, false, null)
+          tempChannel.queueBind(routing_key, exchange, routing_key)
+        }
+        tempChannel.basicPublish(exchange, routing_key, null, message.toString.getBytes)
+      } else {
+        Logger.error("Error: no channels available to submit message")
+      }
+    } finally {
+      if (tempChannel != null) {
+        tempChannel.close()
+      }
     }
-    tempChannel.basicPublish(exchange, routing_key, null, message.toString.getBytes)
   }
 
   /**

doc/src/sphinx/requirements.txt

@@ -16,7 +16,6 @@ pytz==2021.1
 recommonmark==0.6.0
 requests==2.25.1
 snowballstemmer==2.1.0
-sphinx-rtd-theme==0.5.0
 sphinx==3.1.2
 sphinxcontrib-applehelp==1.0.2
 sphinxcontrib-devhelp==1.0.2