Skip to content

Commit

Permalink
Fixed hearthbeat bug (#429)
Browse files Browse the repository at this point in the history
* 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.
  • Loading branch information
lmarini authored Nov 13, 2023
1 parent ccb804e commit f28c203
Show file tree
Hide file tree
Showing 7 changed files with 14 additions and 10 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 3 additions & 5 deletions app/services/MessageService.scala
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion citation.cff
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion doc/src/sphinx/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -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 ---------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion project/Build.scala
Original file line number Diff line number Diff line change
Expand Up @@ -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 = {
Expand Down
2 changes: 1 addition & 1 deletion public/swagger.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion version.sh
Original file line number Diff line number Diff line change
@@ -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
Expand Down

0 comments on commit f28c203

Please sign in to comment.