diff --git a/CHANGELOG.md b/CHANGELOG.md index cc2f90afb..37eb95678 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/) and this project adheres to [Semantic Versioning](http://semver.org/). +## 1.22.1 - 2023-11-10 + +### Fixed +- Fixed hearthbeat bug where if the owner was not set in extractors_info.json clowder would throw and error and the + extractor would not get registered. + ## 1.22.0 - 2023-09-12 ### Added diff --git a/app/services/MessageService.scala b/app/services/MessageService.scala index c6eda512a..1e01a1dba 100644 --- a/app/services/MessageService.scala +++ b/app/services/MessageService.scala @@ -316,11 +316,9 @@ class ExtractorsHeartbeats(channel: Channel, queue: String) extends Actor { val extractionInfoResult = extractor_info.validate[ExtractorInfo] // Determine if there is a user associated with this request - val owner = (json \ "owner").as[String] - val user: Option[User] = if (owner.length > 0) { - users.findByEmail(owner) - } else { - None + val user = (json \ "owner").asOpt[String] match { + case Some(owner) => users.findByEmail(owner) + case None => None } // Update database diff --git a/citation.cff b/citation.cff index 5a092f829..db19d4f0d 100644 --- a/citation.cff +++ b/citation.cff @@ -3,7 +3,7 @@ message: If you use this software, please cite it using these metadata. title: "Clowder: Open Source Data Management for Long Tail Data" abstract: "A customizable and scalable data management system you can install in the cloud or on your own hardware." type: software -version: "1.22.0" +version: "1.22.1" license: "NCSA" repository-code: "https://github.com/clowder-framework/clowder" keywords: diff --git a/doc/src/sphinx/conf.py b/doc/src/sphinx/conf.py index 0997b9b1d..d65ba822e 100644 --- a/doc/src/sphinx/conf.py +++ b/doc/src/sphinx/conf.py @@ -22,7 +22,7 @@ author = 'Luigi Marini' # The full version, including alpha/beta/rc tags -release = '1.22.0' +release = '1.22.1' # -- General configuration --------------------------------------------------- diff --git a/project/Build.scala b/project/Build.scala index cebdf2b27..585a8137b 100644 --- a/project/Build.scala +++ b/project/Build.scala @@ -13,7 +13,7 @@ import NativePackagerKeys._ object ApplicationBuild extends Build { val appName = "clowder" - val version = "1.22.0" + val version = "1.22.1" val jvm = "1.7" def appVersion: String = { diff --git a/public/swagger.yml b/public/swagger.yml index 5e221cda4..221e16ff2 100644 --- a/public/swagger.yml +++ b/public/swagger.yml @@ -9,7 +9,7 @@ info: Clowder is a customizable and scalable data management system to support any data format and multiple research domains. It is under active development and deployed for a variety of research projects. - version: 1.22.0 + version: 1.22.1 termsOfService: https://clowder.ncsa.illinois.edu/clowder/tos contact: name: Clowder diff --git a/version.sh b/version.sh index 7cbc0cf95..509901c7c 100755 --- a/version.sh +++ b/version.sh @@ -1,6 +1,6 @@ #!/bin/bash -VERSION="1.22.0" +VERSION="1.22.1" sed -i~ "s#^ val version = \".*\"\$# val version = \"${VERSION}\"#" project/Build.scala sed -i~ "s#^version: .*\$#version: \"${VERSION}\"#" citation.cff