Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed hearthbeat bug #429

Merged
merged 4 commits into from
Nov 13, 2023
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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-10-30

### 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 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
3 changes: 1 addition & 2 deletions version.sh
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
#!/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
lmarini marked this conversation as resolved.
Show resolved Hide resolved
sed -i~ "s#^ version: .*\$# version: ${VERSION}#" public/swagger.yml
sed -i~ "s#^release = '.*'\$#release = '${VERSION}'#" doc/src/sphinx/conf.py
sed -i~ "s/^##.*unreleased.*$/## ${VERSION} - $(date +'%Y-%m-%d')/i" CHANGELOG.md
Loading