Mercurial > hg > orthanc
changeset 7097:6d624dfcad3e streaming
removed old option "LoaderThreads" and "IndexDirectory" tagged as optional
| author | Sebastien Jodogne <s.jodogne@gmail.com> |
|---|---|
| date | Thu, 13 Aug 2026 14:11:04 +0000 |
| parents | 63aae28fa10f |
| children | 030407cb8e70 |
| files | OrthancServer/Resources/AdvancedConfiguration.json OrthancServer/Resources/Configuration.json OrthancServer/Sources/OrthancConfiguration.h OrthancServer/Sources/OrthancInitialization.cpp |
| diffstat | 4 files changed, 5 insertions(+), 19 deletions(-) [+] |
line wrap: on
line diff
--- a/OrthancServer/Resources/AdvancedConfiguration.json Thu Aug 13 13:18:38 2026 +0000 +++ b/OrthancServer/Resources/AdvancedConfiguration.json Thu Aug 13 14:11:04 2026 +0000 @@ -321,20 +321,6 @@ // Orthanc <= 1.8.1. "MallocArenaMax" : 5, - // Default number of loader threads to use in jobs that read multiple files - // from the storage area when executing some tasks, including: - // - generating archive/media, - // - executing a C-STORE, - // - transmitting resources through Orthanc peering. - // A value of 0 and 1 are equivalent: a single thread is used. - // A value > 1 is meaningful only if the storage is a distributed network storage - // (e.g., object storage plugin). - // (new in Orthanc 1.12.11) - // Note, from 1.10.0 to 1.12.10, a "ZipLoaderThreads" configuration option - // was available only for the ZIP archive/media. It is still available - // for backward compatibility. - "LoaderThreads" : 1, - // Maximum number of DCMTK transcoders that are simultaneously running // at any given time. A value of "0" indicates to use all the // available CPU logical cores. Prior to Orthanc 1.12.6, there was no limit.
--- a/OrthancServer/Resources/Configuration.json Thu Aug 13 13:18:38 2026 +0000 +++ b/OrthancServer/Resources/Configuration.json Thu Aug 13 14:11:04 2026 +0000 @@ -18,9 +18,9 @@ "StorageDirectory" : "OrthancStorage", // Path to the directory that holds the SQLite index (if unset, the - // value of StorageDirectory is used). This index could be stored on + // value of "StorageDirectory" is used). This index could be stored on // a RAM-drive or a SSD device for performance reasons. - "IndexDirectory" : "OrthancStorage", + // "IndexDirectory" : "OrthancStorage", // Enable the transparent compression of the DICOM instances "StorageCompression" : false,
--- a/OrthancServer/Sources/OrthancConfiguration.h Thu Aug 13 13:18:38 2026 +0000 +++ b/OrthancServer/Sources/OrthancConfiguration.h Thu Aug 13 14:11:04 2026 +0000 @@ -56,6 +56,7 @@ #define ORTHANC_CONFIG_CONCURRENT_JOBS "ConcurrentJobs" #define ORTHANC_CONFIG_HTTP_THREADS_COUNT "HttpThreadsCount" #define ORTHANC_CONFIG_DICOM_THREADS_COUNT "DicomThreadsCount" +#define ORTHANC_CONFIG_INDEX_DIRECTORY "IndexDirectory" #define ORTHANC_CONFIG_STORAGE_DIRECTORY "StorageDirectory"
--- a/OrthancServer/Sources/OrthancInitialization.cpp Thu Aug 13 13:18:38 2026 +0000 +++ b/OrthancServer/Sources/OrthancInitialization.cpp Thu Aug 13 14:11:04 2026 +0000 @@ -432,14 +432,13 @@ lock.GetConfiguration().GetStringParameter(ORTHANC_CONFIG_STORAGE_DIRECTORY); std::string indexDirectoryStr; - if (!lock.GetConfiguration().LookupStringParameter(indexDirectoryStr, "IndexDirectory")) + if (!lock.GetConfiguration().LookupStringParameter(indexDirectoryStr, ORTHANC_CONFIG_INDEX_DIRECTORY)) { indexDirectoryStr = storageDirectoryStr; } // Open the database - boost::filesystem::path indexDirectory = lock.GetConfiguration().InterpretStringParameterAsPath( - indexDirectoryStr); + boost::filesystem::path indexDirectory = lock.GetConfiguration().InterpretStringParameterAsPath(indexDirectoryStr); LOG(WARNING) << "SQLite index directory: " << SystemToolbox::PathToUtf8(indexDirectory);