Skip to content

Commit f28c203

Browse files
authored
Fixed hearthbeat bug (#429)
* 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. * Updated version to 1.22.1 * Fixed citation.
1 parent ccb804e commit f28c203

File tree

7 files changed

+14
-10
lines changed

7 files changed

+14
-10
lines changed

CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
55
The format is based on [Keep a Changelog](http://keepachangelog.com/)
66
and this project adheres to [Semantic Versioning](http://semver.org/).
77

8+
## 1.22.1 - 2023-11-10
9+
10+
### Fixed
11+
- Fixed hearthbeat bug where if the owner was not set in extractors_info.json clowder would throw and error and the
12+
extractor would not get registered.
13+
814
## 1.22.0 - 2023-09-12
915

1016
### Added

app/services/MessageService.scala

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -316,11 +316,9 @@ class ExtractorsHeartbeats(channel: Channel, queue: String) extends Actor {
316316
val extractionInfoResult = extractor_info.validate[ExtractorInfo]
317317

318318
// Determine if there is a user associated with this request
319-
val owner = (json \ "owner").as[String]
320-
val user: Option[User] = if (owner.length > 0) {
321-
users.findByEmail(owner)
322-
} else {
323-
None
319+
val user = (json \ "owner").asOpt[String] match {
320+
case Some(owner) => users.findByEmail(owner)
321+
case None => None
324322
}
325323

326324
// Update database

citation.cff

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ message: If you use this software, please cite it using these metadata.
33
title: "Clowder: Open Source Data Management for Long Tail Data"
44
abstract: "A customizable and scalable data management system you can install in the cloud or on your own hardware."
55
type: software
6-
version: "1.22.0"
6+
version: "1.22.1"
77
license: "NCSA"
88
repository-code: "https://github.com/clowder-framework/clowder"
99
keywords:

doc/src/sphinx/conf.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
author = 'Luigi Marini'
2323

2424
# The full version, including alpha/beta/rc tags
25-
release = '1.22.0'
25+
release = '1.22.1'
2626

2727

2828
# -- General configuration ---------------------------------------------------

project/Build.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import NativePackagerKeys._
1313
object ApplicationBuild extends Build {
1414

1515
val appName = "clowder"
16-
val version = "1.22.0"
16+
val version = "1.22.1"
1717
val jvm = "1.7"
1818

1919
def appVersion: String = {

public/swagger.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ info:
99
Clowder is a customizable and scalable data management system to support any
1010
data format and multiple research domains. It is under active development
1111
and deployed for a variety of research projects.
12-
version: 1.22.0
12+
version: 1.22.1
1313
termsOfService: https://clowder.ncsa.illinois.edu/clowder/tos
1414
contact:
1515
name: Clowder

version.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/bash
22

3-
VERSION="1.22.0"
3+
VERSION="1.22.1"
44

55
sed -i~ "s#^ val version = \".*\"\$# val version = \"${VERSION}\"#" project/Build.scala
66
sed -i~ "s#^version: .*\$#version: \"${VERSION}\"#" citation.cff

0 commit comments

Comments
 (0)