Skip to content
This repository has been archived by the owner on Nov 20, 2024. It is now read-only.

Commit

Permalink
Release v0.6.1 Patch (#365)
Browse files Browse the repository at this point in the history
* [GH-1284] Fix docker image generation (#363)

The `Dockerfile` is being invoked in the root directory - we don't need
to add the parent directory, just the current one.

* [GH-1277] Prevent update loop from terminating (#364)

Catch all throwables to make sure a workload failure doesn't bring down
workflow-launcher.

* update changelog + bump patch to v0.6.1
  • Loading branch information
ehigham authored Apr 13, 2021
1 parent 3d75261 commit 75dd604
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 6 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# Release 0.6.1
- [GH-1277] Prevent update loop from terminating ([#364](https://github.com/broadinstitute/wfl/pull/364))
- [GH-1284] Fix docker image generation ([#363](https://github.com/broadinstitute/wfl/pull/363))

# Release 0.6.0
- GH-1282: Document WFL's support for Somatic Genomes. ([#361](https://github.com/broadinstitute/wfl/pull/361))
- GitHub `develop` infrastructure + release changes ([#356](https://github.com/broadinstitute/wfl/pull/356))
Expand Down
2 changes: 1 addition & 1 deletion api/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ WORKDIR /tmp

# Note this step requires docker builds in the root repo context
# e.g. `docker build -t wfl-api:test -f ./api/Dockerfile .`
ADD .. .
ADD . .
RUN make api TARGET=build

# Use a Broad AppSec blessed image for security compliance
Expand Down
7 changes: 3 additions & 4 deletions api/src/wfl/server.clj
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,7 @@
[wfl.service.postgres :as postgres]
[wfl.util :as util]
[wfl.wfl :as wfl])
(:import (java.util.concurrent Future TimeUnit)
(org.postgresql.util PSQLException)))
(:import (java.util.concurrent Future TimeUnit)))

(def description
"The purpose of this command."
Expand Down Expand Up @@ -88,9 +87,9 @@
(jdbc/with-db-transaction [tx (postgres/wfl-db-config)]
(->> (workloads/load-workload-for-id tx id)
(workloads/update-workload! tx)))
(catch PSQLException ex
(catch Throwable t
(log/warnf "Failed to update workload %s" uuid)
(log/warn ex))))
(log/warn t))))
(update-workloads! []
(log/info "updating workloads")
(run! do-update!
Expand Down
2 changes: 1 addition & 1 deletion version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.6.0
0.6.1

0 comments on commit 75dd604

Please sign in to comment.