Small fixes (#225)

* return 404 not 500

* make sure connection is not None

* add changelog

Co-authored-by: Luigi Marini <[email protected]>

Author: robkooper

CHANGELOG.md

@@ -8,6 +8,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 - Added folder and folder id to api datasets files list [#34](https://github.com/clowder-framework/clowder/issues/34)
 
 ### Fixed
+- RabbitMQ will not use connection if None exists
+- previews returns 404 if preview is not found
 - When uploading a file, it would ignore any extractors marked disabled at the space level. [#246](https://github.com/clowder-framework/clowder/issues/246)
 - Added index for comments, will speed up index creation
 - If using S3 storage in docker, it was not reflected correctly in the docker-compose file

app/api/Previews.scala

@@ -93,7 +93,10 @@ class Previews @Inject()(previews: PreviewService, tiles: TileService) extends A
               }
             }
           }
-          case None => Logger.error("No preview find " + id); InternalServerError("No preview found")
+          case None => {
+            Logger.error("No preview found " + id)
+            NotFound("No preview found")
+          }
         }
     }
 

app/services/rabbitmq/RabbitMQMessageService.scala

@@ -234,7 +234,10 @@ class RabbitMQMessageService extends MessageService {
     connect()
     var tempChannel: Channel = null
     try {
-      tempChannel = connection.get.createChannel()
+      tempChannel = connection match {
+        case Some(c) => c.createChannel()
+        case None => null
+      }
       if (tempChannel != null) {
         tempChannel.exchangeDeclare(exchange, exchange_type, true)