orthanc: OrthancServer/Sources/main.cpp comparison

comparison OrthancServer/Sources/main.cpp @ 5833:58c549b881ae find-refactoring-clean

merged find-refactoring -> find-refactoring-clean

author	Alain Mazy <am@orthanc.team>
date	Wed, 09 Oct 2024 11:01:11 +0200
parents	272b0d0eef38
children

comparison

equal deleted inserted replaced

-:f75596b224e0
+:58c549b881ae
 PrintErrorCode(ErrorCode_DatabaseCannotSerialize, "Database could not serialize access due to concurrent update, the transaction should be retried");
 PrintErrorCode(ErrorCode_Revision, "A bad revision number was provided, which might indicate conflict between multiple writers");
 PrintErrorCode(ErrorCode_MainDicomTagsMultiplyDefined, "A main DICOM Tag has been defined multiple times for the same resource level");
 PrintErrorCode(ErrorCode_ForbiddenAccess, "Access to a resource is forbidden");
 PrintErrorCode(ErrorCode_DuplicateResource, "Duplicate resource");
+PrintErrorCode(ErrorCode_IncompatibleConfigurations, "Your configuration file contains configuration that are mutually incompatible");
 PrintErrorCode(ErrorCode_SQLiteNotOpened, "SQLite: The database is not opened");
 PrintErrorCode(ErrorCode_SQLiteAlreadyOpened, "SQLite: Connection is already open");
 PrintErrorCode(ErrorCode_SQLiteCannotOpen, "SQLite: Unable to open the database");
 PrintErrorCode(ErrorCode_SQLiteStatementAlreadyUsed, "SQLite: This cached statement is already being referred to");
 PrintErrorCode(ErrorCode_SQLiteExecute, "SQLite: Cannot execute a command");
 PrintErrorCode(ErrorCode_SQLiteCommitWithoutTransaction, "SQLite: Committing a nonexistent transaction");
 PrintErrorCode(ErrorCode_SQLiteRegisterFunction, "SQLite: Unable to register a function");
 PrintErrorCode(ErrorCode_SQLiteFlush, "SQLite: Unable to flush the database");
 PrintErrorCode(ErrorCode_SQLiteCannotRun, "SQLite: Cannot run a cached statement");
 PrintErrorCode(ErrorCode_SQLiteCannotStep, "SQLite: Cannot step over a cached statement");
-PrintErrorCode(ErrorCode_SQLiteBindOutOfRange, "SQLite: Bing a value while out of range (serious error)");
+PrintErrorCode(ErrorCode_SQLiteBindOutOfRange, "SQLite: Bind a value while out of range (serious error)");
 PrintErrorCode(ErrorCode_SQLitePrepareStatement, "SQLite: Cannot prepare a cached statement");
 PrintErrorCode(ErrorCode_SQLiteTransactionAlreadyStarted, "SQLite: Beginning the same transaction twice");
 PrintErrorCode(ErrorCode_SQLiteTransactionCommit, "SQLite: Failure when committing the transaction");
 PrintErrorCode(ErrorCode_SQLiteTransactionBegin, "SQLite: Cannot start a transaction");
 PrintErrorCode(ErrorCode_DirectoryOverFile, "The directory to be created is already occupied by a regular file");
 IStorageArea& storageArea,
 OrthancPlugins *plugins,
 bool loadJobsFromDatabase)
 {
 size_t maxCompletedJobs;
+bool readOnly;
 {
 OrthancConfiguration::ReaderLock lock;
 // These configuration options must be set before creating the
 if (maxCompletedJobs == 0)
 {
 LOG(WARNING) << "Setting option \"JobsHistorySize\" to zero is not recommended";
 }
+// New option in Orthanc 1.12.5
+readOnly = lock.GetConfiguration().GetBooleanParameter("ReadOnly", false);
 // Configuration of DICOM TLS for Orthanc SCU (since Orthanc 1.9.0)
 DicomAssociationParameters::SetDefaultOwnCertificatePath(
 lock.GetConfiguration().GetStringParameter(KEY_DICOM_TLS_PRIVATE_KEY, ""),
 lock.GetConfiguration().GetStringParameter(KEY_DICOM_TLS_CERTIFICATE, ""));
 DicomAssociationParameters::SetDefaultTrustedCertificatesPath(
 // New option in Orthanc 1.9.3
 DicomAssociationParameters::SetDefaultRemoteCertificateRequired(
 lock.GetConfiguration().GetBooleanParameter(KEY_DICOM_TLS_REMOTE_CERTIFICATE_REQUIRED, true));
 }
-ServerContext context(database, storageArea, false /* not running unit tests */, maxCompletedJobs);
+ServerContext context(database, storageArea, false /* not running unit tests */, maxCompletedJobs, readOnly);
 {
 OrthancConfiguration::ReaderLock lock;
-context.SetCompressionEnabled(lock.GetConfiguration().GetBooleanParameter("StorageCompression", false));
+if (context.IsReadOnly())
-context.SetStoreMD5ForAttachments(lock.GetConfiguration().GetBooleanParameter("StoreMD5ForAttachments", true));
+{
+LOG(WARNING) << "READ-ONLY SYSTEM: ignoring these configurations: StorageCompression, StoreMD5ForAttachments, OverwriteInstances, MaximumPatientCount, MaximumStorageSize, MaximumStorageMode, SaveJobs";
-// New option in Orthanc 1.4.2
+}
-context.SetOverwriteInstances(lock.GetConfiguration().GetBooleanParameter("OverwriteInstances", false));
+else
+{
-try
+context.SetCompressionEnabled(lock.GetConfiguration().GetBooleanParameter("StorageCompression", false));
-{
+context.SetStoreMD5ForAttachments(lock.GetConfiguration().GetBooleanParameter("StoreMD5ForAttachments", true));
-context.GetIndex().SetMaximumPatientCount(lock.GetConfiguration().GetUnsignedIntegerParameter("MaximumPatientCount", 0));
-}
+// New option in Orthanc 1.4.2
-catch (...)
+context.SetOverwriteInstances(lock.GetConfiguration().GetBooleanParameter("OverwriteInstances", false));
-{
-context.GetIndex().SetMaximumPatientCount(0);
+try
-}
+{
+context.GetIndex().SetMaximumPatientCount(lock.GetConfiguration().GetUnsignedIntegerParameter("MaximumPatientCount", 0));
-try
+}
-{
+catch (...)
-uint64_t size = lock.GetConfiguration().GetUnsignedIntegerParameter("MaximumStorageSize", 0);
+{
-context.GetIndex().SetMaximumStorageSize(size * 1024 * 1024);
+context.GetIndex().SetMaximumPatientCount(0);
 }
-catch (...)
-{
+try
-context.GetIndex().SetMaximumStorageSize(0);
+{
-}
+uint64_t size = lock.GetConfiguration().GetUnsignedIntegerParameter("MaximumStorageSize", 0);
+context.GetIndex().SetMaximumStorageSize(size * 1024 * 1024);
-try
+}
-{
+catch (...)
-std::string mode = lock.GetConfiguration().GetStringParameter("MaximumStorageMode", "Recycle");
+{
-context.GetIndex().SetMaximumStorageMode(StringToMaxStorageMode(mode));
+context.GetIndex().SetMaximumStorageSize(0);
 }
-catch (...)
-{
+try
-context.GetIndex().SetMaximumStorageMode(MaxStorageMode_Recycle);
+{
-}
+std::string mode = lock.GetConfiguration().GetStringParameter("MaximumStorageMode", "Recycle");
+context.GetIndex().SetMaximumStorageMode(StringToMaxStorageMode(mode));
+}
+catch (...)
+{
+context.GetIndex().SetMaximumStorageMode(MaxStorageMode_Recycle);
+}
+}
+// note: this config is valid in ReadOnlyMode
 try
 {
 uint64_t size = lock.GetConfiguration().GetUnsignedIntegerParameter("MaximumStorageCacheSize", 128);
 context.SetMaximumStorageCacheSize(size * 1024 * 1024);
 }
 {
 SQLiteDatabaseWrapper inMemoryDatabase;
 inMemoryDatabase.Open();
 MemoryStorageArea inMemoryStorage;
-ServerContext context(inMemoryDatabase, inMemoryStorage, true /* unit testing */, 0 /* max completed jobs */);
+ServerContext context(inMemoryDatabase, inMemoryStorage, true /* unit testing */, 0 /* max completed jobs */, false /* readonly */);
 OrthancRestApi restApi(context, false /* no Orthanc Explorer */);
 restApi.GenerateOpenApiDocumentation(openapi);
 context.Stop();
 }
 {
 SQLiteDatabaseWrapper inMemoryDatabase;
 inMemoryDatabase.Open();
 MemoryStorageArea inMemoryStorage;
-ServerContext context(inMemoryDatabase, inMemoryStorage, true /* unit testing */, 0 /* max completed jobs */);
+ServerContext context(inMemoryDatabase, inMemoryStorage, true /* unit testing */, 0 /* max completed jobs */, false /* readonly */);
 OrthancRestApi restApi(context, false /* no Orthanc Explorer */);
 restApi.GenerateReStructuredTextCheatSheet(cheatsheet, "https://orthanc.uclouvain.be/api/index.html");
 context.Stop();
 }

Mercurial > hg > orthanc

comparison OrthancServer/Sources/main.cpp @ 5833:58c549b881ae find-refactoring-clean