Mercurial > hg > orthanc-object-storage
changeset 8:987cb95c1aee
Prevent Orthanc to start if plugin fails to start
| author | Alain Mazy |
|---|---|
| date | Mon, 20 Jul 2020 12:21:07 +0200 |
| parents | 393fcf337462 |
| children | b09c634e6fea bc77f916104b |
| files | Aws/CMakeLists.txt Azure/CMakeLists.txt Common/StoragePlugin.cpp Google/CMakeLists.txt NEWS |
| diffstat | 5 files changed, 13 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/Aws/CMakeLists.txt Thu Jul 09 10:40:44 2020 +0200 +++ b/Aws/CMakeLists.txt Mon Jul 20 12:21:07 2020 +0200 @@ -9,7 +9,7 @@ include(CheckIncludeFileCXX) set(ORTHANC_FRAMEWORK_SOURCE "hg" CACHE STRING "orthanc source") -set(ORTHANC_FRAMEWORK_VERSION "1.7.0" CACHE STRING "orthanc framework version") +set(ORTHANC_FRAMEWORK_VERSION "7176ebf" CACHE STRING "orthanc framework version") set(ALLOW_DOWNLOADS ON) # Download and setup the Orthanc framework
--- a/Azure/CMakeLists.txt Thu Jul 09 10:40:44 2020 +0200 +++ b/Azure/CMakeLists.txt Mon Jul 20 12:21:07 2020 +0200 @@ -7,7 +7,7 @@ include(CheckIncludeFileCXX) set(ORTHANC_FRAMEWORK_SOURCE "hg" CACHE STRING "orthanc source") -set(ORTHANC_FRAMEWORK_VERSION "1.7.0" CACHE STRING "orthanc framework version") +set(ORTHANC_FRAMEWORK_VERSION "7176ebf" CACHE STRING "orthanc framework version") set(ALLOW_DOWNLOADS ON) # Download and setup the Orthanc framework
--- a/Common/StoragePlugin.cpp Thu Jul 09 10:40:44 2020 +0200 +++ b/Common/StoragePlugin.cpp Mon Jul 20 12:21:07 2020 +0200 @@ -189,6 +189,11 @@ plugin.reset(StoragePluginFactory::CreateStoragePlugin(orthancConfig)); + if (plugin.get() == nullptr) + { + return -1; + } + static const char* const ENCRYPTION_SECTION = "StorageEncryption"; if (orthancConfig.IsSection(ENCRYPTION_SECTION))
--- a/Google/CMakeLists.txt Thu Jul 09 10:40:44 2020 +0200 +++ b/Google/CMakeLists.txt Mon Jul 20 12:21:07 2020 +0200 @@ -7,7 +7,7 @@ include(CheckIncludeFileCXX) set(ORTHANC_FRAMEWORK_SOURCE "hg" CACHE STRING "orthanc source") -set(ORTHANC_FRAMEWORK_VERSION "1.7.0" CACHE STRING "orthanc framework version") +set(ORTHANC_FRAMEWORK_VERSION "7176ebf" CACHE STRING "orthanc framework version") set(ALLOW_DOWNLOADS ON) # Download and setup the Orthanc framework
--- a/NEWS Thu Jul 09 10:40:44 2020 +0200 +++ b/NEWS Mon Jul 20 12:21:07 2020 +0200 @@ -1,6 +1,11 @@ Pending changes in the mainline =============================== +* Prevent Orthanc to start if plugin fails to start + +2020-07-15 - v 0.9.1 +==================== + * AWS: added 3 configurations: Endpoint, ConnectionTimeout, RequestTimeout 2020-07-03 - v 0.9.0