orthanc: OrthancServer/main.cpp annotate

annotate OrthancServer/main.cpp @ 3820:f89eac983c9b transcoding

refactoring DicomUserConnection as DicomAssociation

author	Sebastien Jodogne <s.jodogne@gmail.com>
date	Thu, 09 Apr 2020 17:45:25 +0200
parents	023b2a9f3aa1
children	44bfcfdf42e8

rev	line source
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1 /**
62 a70bb32802ae renaming Server Sebastien Jodogne <s.jodogne@gmail.com> parents: 57 diff changeset	2 * Orthanc - A Lightweight, RESTful DICOM Store
1900 b1291df2f780 2016 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1872 diff changeset	3 * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics
1288 6e7e5ed91c2d upgrade to year 2015 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1285 diff changeset	4 * Department, University Hospital of Liege, Belgium
3640 94f4a18a79cc upgrade to year 2020 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3537 diff changeset	5 * Copyright (C) 2017-2020 Osimis S.A., Belgium
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	6 *
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	7 * This program is free software: you can redistribute it and/or
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	8 * modify it under the terms of the GNU General Public License as
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	9 * published by the Free Software Foundation, either version 3 of the
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	10 * License, or (at your option) any later version.
136 fe180eae201d openssl exception Sebastien Jodogne <s.jodogne@gmail.com> parents: 133 diff changeset	11 *
fe180eae201d openssl exception Sebastien Jodogne <s.jodogne@gmail.com> parents: 133 diff changeset	12 * In addition, as a special exception, the copyright holders of this
fe180eae201d openssl exception Sebastien Jodogne <s.jodogne@gmail.com> parents: 133 diff changeset	13 * program give permission to link the code of its release with the
fe180eae201d openssl exception Sebastien Jodogne <s.jodogne@gmail.com> parents: 133 diff changeset	14 * OpenSSL project's "OpenSSL" library (or with modified versions of it
fe180eae201d openssl exception Sebastien Jodogne <s.jodogne@gmail.com> parents: 133 diff changeset	15 * that use the same license as the "OpenSSL" library), and distribute
fe180eae201d openssl exception Sebastien Jodogne <s.jodogne@gmail.com> parents: 133 diff changeset	16 * the linked executables. You must obey the GNU General Public License
fe180eae201d openssl exception Sebastien Jodogne <s.jodogne@gmail.com> parents: 133 diff changeset	17 * in all respects for all of the code used other than "OpenSSL". If you
fe180eae201d openssl exception Sebastien Jodogne <s.jodogne@gmail.com> parents: 133 diff changeset	18 * modify file(s) with this exception, you may extend this exception to
fe180eae201d openssl exception Sebastien Jodogne <s.jodogne@gmail.com> parents: 133 diff changeset	19 * your version of the file(s), but you are not obligated to do so. If
fe180eae201d openssl exception Sebastien Jodogne <s.jodogne@gmail.com> parents: 133 diff changeset	20 * you do not wish to do so, delete this exception statement from your
fe180eae201d openssl exception Sebastien Jodogne <s.jodogne@gmail.com> parents: 133 diff changeset	21 * version. If you delete this exception statement from all source files
fe180eae201d openssl exception Sebastien Jodogne <s.jodogne@gmail.com> parents: 133 diff changeset	22 * in the program, then also delete it here.
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	23 *
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	24 * This program is distributed in the hope that it will be useful, but
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	25 * WITHOUT ANY WARRANTY; without even the implied warranty of
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	26 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	27 * General Public License for more details.
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	28 *
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	29 * You should have received a copy of the GNU General Public License
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	30 * along with this program. If not, see <http://www.gnu.org/licenses/>.
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	31 **/
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	32
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	33
831 84513f2ee1f3 pch for unit tests and server Sebastien Jodogne <s.jodogne@gmail.com> parents: 824 diff changeset	34 #include "PrecompiledHeadersServer.h"
750 4afad8cb94fd moves Sebastien Jodogne <s.jodogne@gmail.com> parents: 730 diff changeset	35 #include "OrthancRestApi/OrthancRestApi.h"
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	36
112 80ca409f232f logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 108 diff changeset	37 #include <boost/algorithm/string/predicate.hpp>
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	38
3767 c6658187e4b1 cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 3736 diff changeset	39 #include "../Core/Compatibility.h"
387 ff647eedfbe1 enabling of Find/Move commands Sebastien Jodogne <s.jodogne@gmail.com> parents: 376 diff changeset	40 #include "../Core/DicomFormat/DicomArray.h"
2382 7284093111b0 big reorganization to cleanly separate framework vs. server Sebastien Jodogne <s.jodogne@gmail.com> parents: 2381 diff changeset	41 #include "../Core/DicomNetworking/DicomServer.h"
2940 4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2903 diff changeset	42 #include "../Core/DicomParsing/FromDcmtkBridge.h"
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2903 diff changeset	43 #include "../Core/HttpServer/EmbeddedResourceHttpHandler.h"
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2903 diff changeset	44 #include "../Core/HttpServer/FilesystemHttpHandler.h"
3138 ab46e537f92e renamed class MongooseServer as HttpServer, CivetWeb made default HTTP server Sebastien Jodogne <s.jodogne@gmail.com> parents: 3137 diff changeset	45 #include "../Core/HttpServer/HttpServer.h"
2940 4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2903 diff changeset	46 #include "../Core/Logging.h"
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2903 diff changeset	47 #include "../Core/Lua/LuaFunctionCall.h"
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2903 diff changeset	48 #include "../Plugins/Engine/OrthancPlugins.h"
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2903 diff changeset	49 #include "OrthancConfiguration.h"
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2903 diff changeset	50 #include "OrthancFindRequestHandler.h"
62 a70bb32802ae renaming Server Sebastien Jodogne <s.jodogne@gmail.com> parents: 57 diff changeset	51 #include "OrthancInitialization.h"
619 70d0f27e5bd3 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 618 diff changeset	52 #include "OrthancMoveRequestHandler.h"
2940 4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2903 diff changeset	53 #include "ServerContext.h"
3636 bce6ee64f2a4 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 3635 diff changeset	54 #include "ServerJobs/StorageCommitmentScpJob.h"
730 309e686b41e7 better logging about nonexistent tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 725 diff changeset	55 #include "ServerToolbox.h"
3736 0540b54324f1 StorageCommitmentReports Sebastien Jodogne <s.jodogne@gmail.com> parents: 3734 diff changeset	56 #include "StorageCommitmentReports.h"
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	57
62 a70bb32802ae renaming Server Sebastien Jodogne <s.jodogne@gmail.com> parents: 57 diff changeset	58 using namespace Orthanc;
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	59
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	60
613 60d90e48e809 query/retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 565 diff changeset	61 class OrthancStoreRequestHandler : public IStoreRequestHandler
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	62 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	63 private:
3635 8c0ef729d5a8 StorageCommitmentScpJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 3615 diff changeset	64 ServerContext& context_;
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	65
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	66 public:
613 60d90e48e809 query/retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 565 diff changeset	67 OrthancStoreRequestHandler(ServerContext& context) :
3635 8c0ef729d5a8 StorageCommitmentScpJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 3615 diff changeset	68 context_(context)
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	69 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	70 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	71
1573 3309878b3e16 more information about the origin of requests submitted to the DICOM handlers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1572 diff changeset	72
291 4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 270 diff changeset	73 virtual void Handle(const std::string& dicomFile,
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	74 const DicomMap& dicomSummary,
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	75 const Json::Value& dicomJson,
1573 3309878b3e16 more information about the origin of requests submitted to the DICOM handlers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1572 diff changeset	76 const std::string& remoteIp,
1285 5730f374e4e6 Access to called AET and remote AET from Lua scripts Sebastien Jodogne <s.jodogne@gmail.com> parents: 1280 diff changeset	77 const std::string& remoteAet,
1573 3309878b3e16 more information about the origin of requests submitted to the DICOM handlers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1572 diff changeset	78 const std::string& calledAet)
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	79 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	80 if (dicomFile.size() > 0)
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	81 {
1005 84b6d7bca6db refactoring of ServerContext::Store Sebastien Jodogne <s.jodogne@gmail.com> parents: 996 diff changeset	82 DicomInstanceToStore toStore;
2664 a21b244efb37 serialization of DicomModalityStoreJob, OrthancPeerStoreJob and ResourceModificationJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2640 diff changeset	83 toStore.SetOrigin(DicomInstanceOrigin::FromDicomProtocol
a21b244efb37 serialization of DicomModalityStoreJob, OrthancPeerStoreJob and ResourceModificationJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2640 diff changeset	84 (remoteIp.c_str(), remoteAet.c_str(), calledAet.c_str()));
1005 84b6d7bca6db refactoring of ServerContext::Store Sebastien Jodogne <s.jodogne@gmail.com> parents: 996 diff changeset	85 toStore.SetBuffer(dicomFile);
84b6d7bca6db refactoring of ServerContext::Store Sebastien Jodogne <s.jodogne@gmail.com> parents: 996 diff changeset	86 toStore.SetSummary(dicomSummary);
84b6d7bca6db refactoring of ServerContext::Store Sebastien Jodogne <s.jodogne@gmail.com> parents: 996 diff changeset	87 toStore.SetJson(dicomJson);
84b6d7bca6db refactoring of ServerContext::Store Sebastien Jodogne <s.jodogne@gmail.com> parents: 996 diff changeset	88
84b6d7bca6db refactoring of ServerContext::Store Sebastien Jodogne <s.jodogne@gmail.com> parents: 996 diff changeset	89 std::string id;
3814 023b2a9f3aa1 new enum: StoreInstanceMode Sebastien Jodogne <s.jodogne@gmail.com> parents: 3813 diff changeset	90 context_.Store(id, toStore, StoreInstanceMode_Default);
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	91 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	92 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	93 };
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	94
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	95
1797 23722a191e4e worklists are working Sebastien Jodogne <s.jodogne@gmail.com> parents: 1796 diff changeset	96
3635 8c0ef729d5a8 StorageCommitmentScpJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 3615 diff changeset	97 class OrthancStorageCommitmentRequestHandler : public IStorageCommitmentRequestHandler
8c0ef729d5a8 StorageCommitmentScpJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 3615 diff changeset	98 {
8c0ef729d5a8 StorageCommitmentScpJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 3615 diff changeset	99 private:
8c0ef729d5a8 StorageCommitmentScpJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 3615 diff changeset	100 ServerContext& context_;
3606 33ba63637d48 DicomUserConnection: sending N-EVENT-REPORT-RQ Sebastien Jodogne <s.jodogne@gmail.com> parents: 3604 diff changeset	101
3604 e327b44780bb abstraction: storage commitment handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 3537 diff changeset	102 public:
e327b44780bb abstraction: storage commitment handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 3537 diff changeset	103 OrthancStorageCommitmentRequestHandler(ServerContext& context) :
3635 8c0ef729d5a8 StorageCommitmentScpJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 3615 diff changeset	104 context_(context)
3604 e327b44780bb abstraction: storage commitment handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 3537 diff changeset	105 {
e327b44780bb abstraction: storage commitment handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 3537 diff changeset	106 }
e327b44780bb abstraction: storage commitment handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 3537 diff changeset	107
3613 c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3608 diff changeset	108 virtual void HandleRequest(const std::string& transactionUid,
c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3608 diff changeset	109 const std::vector<std::string>& referencedSopClassUids,
c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3608 diff changeset	110 const std::vector<std::string>& referencedSopInstanceUids,
c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3608 diff changeset	111 const std::string& remoteIp,
c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3608 diff changeset	112 const std::string& remoteAet,
c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3608 diff changeset	113 const std::string& calledAet)
3604 e327b44780bb abstraction: storage commitment handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 3537 diff changeset	114 {
3635 8c0ef729d5a8 StorageCommitmentScpJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 3615 diff changeset	115 if (referencedSopClassUids.size() != referencedSopInstanceUids.size())
8c0ef729d5a8 StorageCommitmentScpJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 3615 diff changeset	116 {
8c0ef729d5a8 StorageCommitmentScpJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 3615 diff changeset	117 throw OrthancException(ErrorCode_InternalError);
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	118 }
3635 8c0ef729d5a8 StorageCommitmentScpJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 3615 diff changeset	119
3767 c6658187e4b1 cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 3736 diff changeset	120 std::unique_ptr<StorageCommitmentScpJob> job(
3635 8c0ef729d5a8 StorageCommitmentScpJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 3615 diff changeset	121 new StorageCommitmentScpJob(context_, transactionUid, remoteAet, calledAet));
3606 33ba63637d48 DicomUserConnection: sending N-EVENT-REPORT-RQ Sebastien Jodogne <s.jodogne@gmail.com> parents: 3604 diff changeset	122
3635 8c0ef729d5a8 StorageCommitmentScpJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 3615 diff changeset	123 for (size_t i = 0; i < referencedSopClassUids.size(); i++)
8c0ef729d5a8 StorageCommitmentScpJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 3615 diff changeset	124 {
8c0ef729d5a8 StorageCommitmentScpJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 3615 diff changeset	125 job->AddInstance(referencedSopClassUids[i], referencedSopInstanceUids[i]);
8c0ef729d5a8 StorageCommitmentScpJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 3615 diff changeset	126 }
3613 c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3608 diff changeset	127
3635 8c0ef729d5a8 StorageCommitmentScpJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 3615 diff changeset	128 job->MarkAsReady();
8c0ef729d5a8 StorageCommitmentScpJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 3615 diff changeset	129
8c0ef729d5a8 StorageCommitmentScpJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 3615 diff changeset	130 context_.GetJobsEngine().GetRegistry().Submit(job.release(), 0 /* default priority */);
3613 c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3608 diff changeset	131 }
c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3608 diff changeset	132
c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3608 diff changeset	133 virtual void HandleReport(const std::string& transactionUid,
c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3608 diff changeset	134 const std::vector<std::string>& successSopClassUids,
c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3608 diff changeset	135 const std::vector<std::string>& successSopInstanceUids,
c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3608 diff changeset	136 const std::vector<std::string>& failedSopClassUids,
c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3608 diff changeset	137 const std::vector<std::string>& failedSopInstanceUids,
3736 0540b54324f1 StorageCommitmentReports Sebastien Jodogne <s.jodogne@gmail.com> parents: 3734 diff changeset	138 const std::vector<StorageCommitmentFailureReason>& failureReasons,
3613 c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3608 diff changeset	139 const std::string& remoteIp,
c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3608 diff changeset	140 const std::string& remoteAet,
c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3608 diff changeset	141 const std::string& calledAet)
c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3608 diff changeset	142 {
3736 0540b54324f1 StorageCommitmentReports Sebastien Jodogne <s.jodogne@gmail.com> parents: 3734 diff changeset	143 if (successSopClassUids.size() != successSopInstanceUids.size() \|\|
0540b54324f1 StorageCommitmentReports Sebastien Jodogne <s.jodogne@gmail.com> parents: 3734 diff changeset	144 failedSopClassUids.size() != failedSopInstanceUids.size() \|\|
0540b54324f1 StorageCommitmentReports Sebastien Jodogne <s.jodogne@gmail.com> parents: 3734 diff changeset	145 failedSopClassUids.size() != failureReasons.size())
0540b54324f1 StorageCommitmentReports Sebastien Jodogne <s.jodogne@gmail.com> parents: 3734 diff changeset	146 {
0540b54324f1 StorageCommitmentReports Sebastien Jodogne <s.jodogne@gmail.com> parents: 3734 diff changeset	147 throw OrthancException(ErrorCode_InternalError);
0540b54324f1 StorageCommitmentReports Sebastien Jodogne <s.jodogne@gmail.com> parents: 3734 diff changeset	148 }
0540b54324f1 StorageCommitmentReports Sebastien Jodogne <s.jodogne@gmail.com> parents: 3734 diff changeset	149
0540b54324f1 StorageCommitmentReports Sebastien Jodogne <s.jodogne@gmail.com> parents: 3734 diff changeset	150 std::unique_ptr<StorageCommitmentReports::Report> report(
0540b54324f1 StorageCommitmentReports Sebastien Jodogne <s.jodogne@gmail.com> parents: 3734 diff changeset	151 new StorageCommitmentReports::Report(remoteAet));
0540b54324f1 StorageCommitmentReports Sebastien Jodogne <s.jodogne@gmail.com> parents: 3734 diff changeset	152
0540b54324f1 StorageCommitmentReports Sebastien Jodogne <s.jodogne@gmail.com> parents: 3734 diff changeset	153 for (size_t i = 0; i < successSopClassUids.size(); i++)
0540b54324f1 StorageCommitmentReports Sebastien Jodogne <s.jodogne@gmail.com> parents: 3734 diff changeset	154 {
0540b54324f1 StorageCommitmentReports Sebastien Jodogne <s.jodogne@gmail.com> parents: 3734 diff changeset	155 report->AddSuccess(successSopClassUids[i], successSopInstanceUids[i]);
0540b54324f1 StorageCommitmentReports Sebastien Jodogne <s.jodogne@gmail.com> parents: 3734 diff changeset	156 }
0540b54324f1 StorageCommitmentReports Sebastien Jodogne <s.jodogne@gmail.com> parents: 3734 diff changeset	157
0540b54324f1 StorageCommitmentReports Sebastien Jodogne <s.jodogne@gmail.com> parents: 3734 diff changeset	158 for (size_t i = 0; i < failedSopClassUids.size(); i++)
0540b54324f1 StorageCommitmentReports Sebastien Jodogne <s.jodogne@gmail.com> parents: 3734 diff changeset	159 {
0540b54324f1 StorageCommitmentReports Sebastien Jodogne <s.jodogne@gmail.com> parents: 3734 diff changeset	160 report->AddFailure(failedSopClassUids[i], failedSopInstanceUids[i], failureReasons[i]);
0540b54324f1 StorageCommitmentReports Sebastien Jodogne <s.jodogne@gmail.com> parents: 3734 diff changeset	161 }
0540b54324f1 StorageCommitmentReports Sebastien Jodogne <s.jodogne@gmail.com> parents: 3734 diff changeset	162
0540b54324f1 StorageCommitmentReports Sebastien Jodogne <s.jodogne@gmail.com> parents: 3734 diff changeset	163 report->MarkAsComplete();
0540b54324f1 StorageCommitmentReports Sebastien Jodogne <s.jodogne@gmail.com> parents: 3734 diff changeset	164
0540b54324f1 StorageCommitmentReports Sebastien Jodogne <s.jodogne@gmail.com> parents: 3734 diff changeset	165 context_.GetStorageCommitmentReports().Store(transactionUid, report.release());
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	166 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	167 };
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	168
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	169
1797 23722a191e4e worklists are working Sebastien Jodogne <s.jodogne@gmail.com> parents: 1796 diff changeset	170
2940 4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2903 diff changeset	171 class ModalitiesFromConfiguration : public DicomServer::IRemoteModalities
2381 b8969010b534 uncoupling DCMTK primitives from Orthanc::Configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2375 diff changeset	172 {
b8969010b534 uncoupling DCMTK primitives from Orthanc::Configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2375 diff changeset	173 public:
b8969010b534 uncoupling DCMTK primitives from Orthanc::Configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2375 diff changeset	174 virtual bool IsSameAETitle(const std::string& aet1,
b8969010b534 uncoupling DCMTK primitives from Orthanc::Configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2375 diff changeset	175 const std::string& aet2)
b8969010b534 uncoupling DCMTK primitives from Orthanc::Configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2375 diff changeset	176 {
2940 4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2903 diff changeset	177 OrthancConfiguration::ReaderLock lock;
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2903 diff changeset	178 return lock.GetConfiguration().IsSameAETitle(aet1, aet2);
2381 b8969010b534 uncoupling DCMTK primitives from Orthanc::Configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2375 diff changeset	179 }
b8969010b534 uncoupling DCMTK primitives from Orthanc::Configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2375 diff changeset	180
b8969010b534 uncoupling DCMTK primitives from Orthanc::Configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2375 diff changeset	181 virtual bool LookupAETitle(RemoteModalityParameters& modality,
b8969010b534 uncoupling DCMTK primitives from Orthanc::Configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2375 diff changeset	182 const std::string& aet)
b8969010b534 uncoupling DCMTK primitives from Orthanc::Configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2375 diff changeset	183 {
2940 4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2903 diff changeset	184 OrthancConfiguration::ReaderLock lock;
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2903 diff changeset	185 return lock.GetConfiguration().LookupDicomModalityUsingAETitle(modality, aet);
2381 b8969010b534 uncoupling DCMTK primitives from Orthanc::Configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2375 diff changeset	186 }
b8969010b534 uncoupling DCMTK primitives from Orthanc::Configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2375 diff changeset	187 };
b8969010b534 uncoupling DCMTK primitives from Orthanc::Configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2375 diff changeset	188
b8969010b534 uncoupling DCMTK primitives from Orthanc::Configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2375 diff changeset	189
387 ff647eedfbe1 enabling of Find/Move commands Sebastien Jodogne <s.jodogne@gmail.com> parents: 376 diff changeset	190 class MyDicomServerFactory :
ff647eedfbe1 enabling of Find/Move commands Sebastien Jodogne <s.jodogne@gmail.com> parents: 376 diff changeset	191 public IStoreRequestHandlerFactory,
1800 30e97a1f4093 callback for handling worklists with plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1799 diff changeset	192 public IFindRequestHandlerFactory,
3604 e327b44780bb abstraction: storage commitment handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 3537 diff changeset	193 public IMoveRequestHandlerFactory,
e327b44780bb abstraction: storage commitment handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 3537 diff changeset	194 public IStorageCommitmentRequestHandlerFactory
387 ff647eedfbe1 enabling of Find/Move commands Sebastien Jodogne <s.jodogne@gmail.com> parents: 376 diff changeset	195 {
ff647eedfbe1 enabling of Find/Move commands Sebastien Jodogne <s.jodogne@gmail.com> parents: 376 diff changeset	196 private:
ff647eedfbe1 enabling of Find/Move commands Sebastien Jodogne <s.jodogne@gmail.com> parents: 376 diff changeset	197 ServerContext& context_;
ff647eedfbe1 enabling of Find/Move commands Sebastien Jodogne <s.jodogne@gmail.com> parents: 376 diff changeset	198
ff647eedfbe1 enabling of Find/Move commands Sebastien Jodogne <s.jodogne@gmail.com> parents: 376 diff changeset	199 public:
ff647eedfbe1 enabling of Find/Move commands Sebastien Jodogne <s.jodogne@gmail.com> parents: 376 diff changeset	200 MyDicomServerFactory(ServerContext& context) : context_(context)
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	201 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	202 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	203
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	204 virtual IStoreRequestHandler* ConstructStoreRequestHandler()
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	205 {
613 60d90e48e809 query/retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 565 diff changeset	206 return new OrthancStoreRequestHandler(context_);
387 ff647eedfbe1 enabling of Find/Move commands Sebastien Jodogne <s.jodogne@gmail.com> parents: 376 diff changeset	207 }
ff647eedfbe1 enabling of Find/Move commands Sebastien Jodogne <s.jodogne@gmail.com> parents: 376 diff changeset	208
ff647eedfbe1 enabling of Find/Move commands Sebastien Jodogne <s.jodogne@gmail.com> parents: 376 diff changeset	209 virtual IFindRequestHandler* ConstructFindRequestHandler()
ff647eedfbe1 enabling of Find/Move commands Sebastien Jodogne <s.jodogne@gmail.com> parents: 376 diff changeset	210 {
3712 2a170a8f1faf replacing std::auto_ptr by std::unique_ptr Sebastien Jodogne <s.jodogne@gmail.com> parents: 3643 diff changeset	211 std::unique_ptr<OrthancFindRequestHandler> result(new OrthancFindRequestHandler(context_));
941 83489fddd8c5 Options to limit the number of results for an incoming C-FIND query Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	212
2940 4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2903 diff changeset	213 {
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2903 diff changeset	214 OrthancConfiguration::ReaderLock lock;
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2903 diff changeset	215 result->SetMaxResults(lock.GetConfiguration().GetUnsignedIntegerParameter("LimitFindResults", 0));
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2903 diff changeset	216 result->SetMaxInstances(lock.GetConfiguration().GetUnsignedIntegerParameter("LimitFindInstances", 0));
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2903 diff changeset	217 }
941 83489fddd8c5 Options to limit the number of results for an incoming C-FIND query Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	218
83489fddd8c5 Options to limit the number of results for an incoming C-FIND query Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	219 if (result->GetMaxResults() == 0)
83489fddd8c5 Options to limit the number of results for an incoming C-FIND query Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	220 {
83489fddd8c5 Options to limit the number of results for an incoming C-FIND query Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	221 LOG(INFO) << "No limit on the number of C-FIND results at the Patient, Study and Series levels";
83489fddd8c5 Options to limit the number of results for an incoming C-FIND query Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	222 }
83489fddd8c5 Options to limit the number of results for an incoming C-FIND query Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	223 else
83489fddd8c5 Options to limit the number of results for an incoming C-FIND query Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	224 {
83489fddd8c5 Options to limit the number of results for an incoming C-FIND query Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	225 LOG(INFO) << "Maximum " << result->GetMaxResults()
83489fddd8c5 Options to limit the number of results for an incoming C-FIND query Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	226 << " results for C-FIND queries at the Patient, Study and Series levels";
83489fddd8c5 Options to limit the number of results for an incoming C-FIND query Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	227 }
83489fddd8c5 Options to limit the number of results for an incoming C-FIND query Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	228
83489fddd8c5 Options to limit the number of results for an incoming C-FIND query Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	229 if (result->GetMaxInstances() == 0)
83489fddd8c5 Options to limit the number of results for an incoming C-FIND query Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	230 {
83489fddd8c5 Options to limit the number of results for an incoming C-FIND query Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	231 LOG(INFO) << "No limit on the number of C-FIND results at the Instance level";
83489fddd8c5 Options to limit the number of results for an incoming C-FIND query Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	232 }
83489fddd8c5 Options to limit the number of results for an incoming C-FIND query Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	233 else
83489fddd8c5 Options to limit the number of results for an incoming C-FIND query Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	234 {
83489fddd8c5 Options to limit the number of results for an incoming C-FIND query Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	235 LOG(INFO) << "Maximum " << result->GetMaxInstances()
83489fddd8c5 Options to limit the number of results for an incoming C-FIND query Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	236 << " instances will be returned for C-FIND queries at the Instance level";
83489fddd8c5 Options to limit the number of results for an incoming C-FIND query Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	237 }
83489fddd8c5 Options to limit the number of results for an incoming C-FIND query Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	238
83489fddd8c5 Options to limit the number of results for an incoming C-FIND query Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	239 return result.release();
387 ff647eedfbe1 enabling of Find/Move commands Sebastien Jodogne <s.jodogne@gmail.com> parents: 376 diff changeset	240 }
ff647eedfbe1 enabling of Find/Move commands Sebastien Jodogne <s.jodogne@gmail.com> parents: 376 diff changeset	241
ff647eedfbe1 enabling of Find/Move commands Sebastien Jodogne <s.jodogne@gmail.com> parents: 376 diff changeset	242 virtual IMoveRequestHandler* ConstructMoveRequestHandler()
ff647eedfbe1 enabling of Find/Move commands Sebastien Jodogne <s.jodogne@gmail.com> parents: 376 diff changeset	243 {
613 60d90e48e809 query/retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 565 diff changeset	244 return new OrthancMoveRequestHandler(context_);
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	245 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	246
3604 e327b44780bb abstraction: storage commitment handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 3537 diff changeset	247 virtual IStorageCommitmentRequestHandler* ConstructStorageCommitmentRequestHandler()
e327b44780bb abstraction: storage commitment handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 3537 diff changeset	248 {
e327b44780bb abstraction: storage commitment handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 3537 diff changeset	249 return new OrthancStorageCommitmentRequestHandler(context_);
e327b44780bb abstraction: storage commitment handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 3537 diff changeset	250 }
e327b44780bb abstraction: storage commitment handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 3537 diff changeset	251
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	252 void Done()
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	253 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	254 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	255 };
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	256
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	257
618 5ab377df6d8b filtering on aet Sebastien Jodogne <s.jodogne@gmail.com> parents: 614 diff changeset	258 class OrthancApplicationEntityFilter : public IApplicationEntityFilter
5ab377df6d8b filtering on aet Sebastien Jodogne <s.jodogne@gmail.com> parents: 614 diff changeset	259 {
1164 0a55d8eb194e Configuration/Lua to select the accepted C-Store SCP transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1163 diff changeset	260 private:
2617 912a767911b0 back to a single Lua context Sebastien Jodogne <s.jodogne@gmail.com> parents: 2616 diff changeset	261 ServerContext& context_;
912a767911b0 back to a single Lua context Sebastien Jodogne <s.jodogne@gmail.com> parents: 2616 diff changeset	262 bool alwaysAllowEcho_;
912a767911b0 back to a single Lua context Sebastien Jodogne <s.jodogne@gmail.com> parents: 2616 diff changeset	263 bool alwaysAllowStore_;
1164 0a55d8eb194e Configuration/Lua to select the accepted C-Store SCP transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1163 diff changeset	264
618 5ab377df6d8b filtering on aet Sebastien Jodogne <s.jodogne@gmail.com> parents: 614 diff changeset	265 public:
2353 2421c137c304 reject connections earlier if DicomAlwaysAllowStore == false Sebastien Jodogne <s.jodogne@gmail.com> parents: 2352 diff changeset	266 OrthancApplicationEntityFilter(ServerContext& context) :
2421c137c304 reject connections earlier if DicomAlwaysAllowStore == false Sebastien Jodogne <s.jodogne@gmail.com> parents: 2352 diff changeset	267 context_(context)
1164 0a55d8eb194e Configuration/Lua to select the accepted C-Store SCP transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1163 diff changeset	268 {
2940 4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2903 diff changeset	269 OrthancConfiguration::ReaderLock lock;
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2903 diff changeset	270 alwaysAllowEcho_ = lock.GetConfiguration().GetBooleanParameter("DicomAlwaysAllowEcho", true);
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2903 diff changeset	271 alwaysAllowStore_ = lock.GetConfiguration().GetBooleanParameter("DicomAlwaysAllowStore", true);
1164 0a55d8eb194e Configuration/Lua to select the accepted C-Store SCP transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1163 diff changeset	272 }
0a55d8eb194e Configuration/Lua to select the accepted C-Store SCP transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1163 diff changeset	273
2352 3ab96768d144 Fix issue 52 (DICOM level security association problems) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2299 diff changeset	274 virtual bool IsAllowedConnection(const std::string& remoteIp,
3ab96768d144 Fix issue 52 (DICOM level security association problems) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2299 diff changeset	275 const std::string& remoteAet,
3ab96768d144 Fix issue 52 (DICOM level security association problems) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2299 diff changeset	276 const std::string& calledAet)
618 5ab377df6d8b filtering on aet Sebastien Jodogne <s.jodogne@gmail.com> parents: 614 diff changeset	277 {
2352 3ab96768d144 Fix issue 52 (DICOM level security association problems) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2299 diff changeset	278 LOG(INFO) << "Incoming connection from AET " << remoteAet
3ab96768d144 Fix issue 52 (DICOM level security association problems) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2299 diff changeset	279 << " on IP " << remoteIp << ", calling AET " << calledAet;
2353 2421c137c304 reject connections earlier if DicomAlwaysAllowStore == false Sebastien Jodogne <s.jodogne@gmail.com> parents: 2352 diff changeset	280
2940 4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2903 diff changeset	281 if (alwaysAllowEcho_ \|\|
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2903 diff changeset	282 alwaysAllowStore_)
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2903 diff changeset	283 {
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2903 diff changeset	284 return true;
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2903 diff changeset	285 }
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2903 diff changeset	286 else
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2903 diff changeset	287 {
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2903 diff changeset	288 OrthancConfiguration::ReaderLock lock;
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2903 diff changeset	289 return lock.GetConfiguration().IsKnownAETitle(remoteAet, remoteIp);
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2903 diff changeset	290 }
620 4aa6f0d79947 security filter for dicom requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 619 diff changeset	291 }
4aa6f0d79947 security filter for dicom requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 619 diff changeset	292
2352 3ab96768d144 Fix issue 52 (DICOM level security association problems) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2299 diff changeset	293 virtual bool IsAllowedRequest(const std::string& remoteIp,
1799 4f01c9d73f02 calledAet made available to all the handlers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1797 diff changeset	294 const std::string& remoteAet,
2352 3ab96768d144 Fix issue 52 (DICOM level security association problems) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2299 diff changeset	295 const std::string& calledAet,
620 4aa6f0d79947 security filter for dicom requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 619 diff changeset	296 DicomRequestType type)
4aa6f0d79947 security filter for dicom requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 619 diff changeset	297 {
2940 4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2903 diff changeset	298 LOG(INFO) << "Incoming " << EnumerationToString(type) << " request from AET "
2352 3ab96768d144 Fix issue 52 (DICOM level security association problems) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2299 diff changeset	299 << remoteAet << " on IP " << remoteIp << ", calling AET " << calledAet;
3ab96768d144 Fix issue 52 (DICOM level security association problems) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2299 diff changeset	300
2375 3ec85ff48374 New security-related options: "DicomAlwaysAllowEcho" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2353 diff changeset	301 if (type == DicomRequestType_Echo &&
3ec85ff48374 New security-related options: "DicomAlwaysAllowEcho" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2353 diff changeset	302 alwaysAllowEcho_)
620 4aa6f0d79947 security filter for dicom requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 619 diff changeset	303 {
2375 3ec85ff48374 New security-related options: "DicomAlwaysAllowEcho" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2353 diff changeset	304 // Incoming C-Echo requests are always accepted, even from unknown AET
3ec85ff48374 New security-related options: "DicomAlwaysAllowEcho" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2353 diff changeset	305 return true;
3ec85ff48374 New security-related options: "DicomAlwaysAllowEcho" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2353 diff changeset	306 }
3ec85ff48374 New security-related options: "DicomAlwaysAllowEcho" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2353 diff changeset	307 else if (type == DicomRequestType_Store &&
3ec85ff48374 New security-related options: "DicomAlwaysAllowEcho" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2353 diff changeset	308 alwaysAllowStore_)
3ec85ff48374 New security-related options: "DicomAlwaysAllowEcho" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2353 diff changeset	309 {
3ec85ff48374 New security-related options: "DicomAlwaysAllowEcho" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2353 diff changeset	310 // Incoming C-Store requests are always accepted, even from unknown AET
620 4aa6f0d79947 security filter for dicom requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 619 diff changeset	311 return true;
4aa6f0d79947 security filter for dicom requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 619 diff changeset	312 }
618 5ab377df6d8b filtering on aet Sebastien Jodogne <s.jodogne@gmail.com> parents: 614 diff changeset	313 else
5ab377df6d8b filtering on aet Sebastien Jodogne <s.jodogne@gmail.com> parents: 614 diff changeset	314 {
2940 4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2903 diff changeset	315 OrthancConfiguration::ReaderLock lock;
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2903 diff changeset	316
2872 9d08edde614b Possibility to restrict the allowed DICOM commands for each modality Sebastien Jodogne <s.jodogne@gmail.com> parents: 2825 diff changeset	317 RemoteModalityParameters modality;
2940 4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2903 diff changeset	318 if (lock.GetConfiguration().LookupDicomModalityUsingAETitle(modality, remoteAet))
2872 9d08edde614b Possibility to restrict the allowed DICOM commands for each modality Sebastien Jodogne <s.jodogne@gmail.com> parents: 2825 diff changeset	319 {
9d08edde614b Possibility to restrict the allowed DICOM commands for each modality Sebastien Jodogne <s.jodogne@gmail.com> parents: 2825 diff changeset	320 return modality.IsRequestAllowed(type);
9d08edde614b Possibility to restrict the allowed DICOM commands for each modality Sebastien Jodogne <s.jodogne@gmail.com> parents: 2825 diff changeset	321 }
9d08edde614b Possibility to restrict the allowed DICOM commands for each modality Sebastien Jodogne <s.jodogne@gmail.com> parents: 2825 diff changeset	322 else
9d08edde614b Possibility to restrict the allowed DICOM commands for each modality Sebastien Jodogne <s.jodogne@gmail.com> parents: 2825 diff changeset	323 {
9d08edde614b Possibility to restrict the allowed DICOM commands for each modality Sebastien Jodogne <s.jodogne@gmail.com> parents: 2825 diff changeset	324 return false;
9d08edde614b Possibility to restrict the allowed DICOM commands for each modality Sebastien Jodogne <s.jodogne@gmail.com> parents: 2825 diff changeset	325 }
618 5ab377df6d8b filtering on aet Sebastien Jodogne <s.jodogne@gmail.com> parents: 614 diff changeset	326 }
5ab377df6d8b filtering on aet Sebastien Jodogne <s.jodogne@gmail.com> parents: 614 diff changeset	327 }
1163 3db41779d8f9 abstraction to allow/prevent transfer syntaxes on AET basis Sebastien Jodogne <s.jodogne@gmail.com> parents: 1135 diff changeset	328
1799 4f01c9d73f02 calledAet made available to all the handlers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1797 diff changeset	329 virtual bool IsAllowedTransferSyntax(const std::string& remoteIp,
4f01c9d73f02 calledAet made available to all the handlers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1797 diff changeset	330 const std::string& remoteAet,
1806 cd213ebcaefd UnknownSopClassAccepted option Sebastien Jodogne <s.jodogne@gmail.com> parents: 1802 diff changeset	331 const std::string& calledAet,
1163 3db41779d8f9 abstraction to allow/prevent transfer syntaxes on AET basis Sebastien Jodogne <s.jodogne@gmail.com> parents: 1135 diff changeset	332 TransferSyntax syntax)
3db41779d8f9 abstraction to allow/prevent transfer syntaxes on AET basis Sebastien Jodogne <s.jodogne@gmail.com> parents: 1135 diff changeset	333 {
1164 0a55d8eb194e Configuration/Lua to select the accepted C-Store SCP transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1163 diff changeset	334 std::string configuration;
0a55d8eb194e Configuration/Lua to select the accepted C-Store SCP transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1163 diff changeset	335
0a55d8eb194e Configuration/Lua to select the accepted C-Store SCP transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1163 diff changeset	336 switch (syntax)
0a55d8eb194e Configuration/Lua to select the accepted C-Store SCP transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1163 diff changeset	337 {
0a55d8eb194e Configuration/Lua to select the accepted C-Store SCP transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1163 diff changeset	338 case TransferSyntax_Deflated:
0a55d8eb194e Configuration/Lua to select the accepted C-Store SCP transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1163 diff changeset	339 configuration = "DeflatedTransferSyntaxAccepted";
0a55d8eb194e Configuration/Lua to select the accepted C-Store SCP transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1163 diff changeset	340 break;
0a55d8eb194e Configuration/Lua to select the accepted C-Store SCP transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1163 diff changeset	341
0a55d8eb194e Configuration/Lua to select the accepted C-Store SCP transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1163 diff changeset	342 case TransferSyntax_Jpeg:
0a55d8eb194e Configuration/Lua to select the accepted C-Store SCP transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1163 diff changeset	343 configuration = "JpegTransferSyntaxAccepted";
0a55d8eb194e Configuration/Lua to select the accepted C-Store SCP transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1163 diff changeset	344 break;
0a55d8eb194e Configuration/Lua to select the accepted C-Store SCP transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1163 diff changeset	345
0a55d8eb194e Configuration/Lua to select the accepted C-Store SCP transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1163 diff changeset	346 case TransferSyntax_Jpeg2000:
0a55d8eb194e Configuration/Lua to select the accepted C-Store SCP transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1163 diff changeset	347 configuration = "Jpeg2000TransferSyntaxAccepted";
0a55d8eb194e Configuration/Lua to select the accepted C-Store SCP transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1163 diff changeset	348 break;
0a55d8eb194e Configuration/Lua to select the accepted C-Store SCP transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1163 diff changeset	349
0a55d8eb194e Configuration/Lua to select the accepted C-Store SCP transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1163 diff changeset	350 case TransferSyntax_JpegLossless:
0a55d8eb194e Configuration/Lua to select the accepted C-Store SCP transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1163 diff changeset	351 configuration = "JpegLosslessTransferSyntaxAccepted";
0a55d8eb194e Configuration/Lua to select the accepted C-Store SCP transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1163 diff changeset	352 break;
0a55d8eb194e Configuration/Lua to select the accepted C-Store SCP transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1163 diff changeset	353
0a55d8eb194e Configuration/Lua to select the accepted C-Store SCP transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1163 diff changeset	354 case TransferSyntax_Jpip:
0a55d8eb194e Configuration/Lua to select the accepted C-Store SCP transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1163 diff changeset	355 configuration = "JpipTransferSyntaxAccepted";
0a55d8eb194e Configuration/Lua to select the accepted C-Store SCP transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1163 diff changeset	356 break;
0a55d8eb194e Configuration/Lua to select the accepted C-Store SCP transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1163 diff changeset	357
0a55d8eb194e Configuration/Lua to select the accepted C-Store SCP transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1163 diff changeset	358 case TransferSyntax_Mpeg2:
0a55d8eb194e Configuration/Lua to select the accepted C-Store SCP transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1163 diff changeset	359 configuration = "Mpeg2TransferSyntaxAccepted";
0a55d8eb194e Configuration/Lua to select the accepted C-Store SCP transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1163 diff changeset	360 break;
0a55d8eb194e Configuration/Lua to select the accepted C-Store SCP transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1163 diff changeset	361
3643 fa3ff492fb3b added TransferSyntax_Mpeg4 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	362 case TransferSyntax_Mpeg4:
fa3ff492fb3b added TransferSyntax_Mpeg4 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	363 configuration = "Mpeg4TransferSyntaxAccepted";
fa3ff492fb3b added TransferSyntax_Mpeg4 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	364 break;
fa3ff492fb3b added TransferSyntax_Mpeg4 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	365
1164 0a55d8eb194e Configuration/Lua to select the accepted C-Store SCP transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1163 diff changeset	366 case TransferSyntax_Rle:
0a55d8eb194e Configuration/Lua to select the accepted C-Store SCP transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1163 diff changeset	367 configuration = "RleTransferSyntaxAccepted";
0a55d8eb194e Configuration/Lua to select the accepted C-Store SCP transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1163 diff changeset	368 break;
0a55d8eb194e Configuration/Lua to select the accepted C-Store SCP transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1163 diff changeset	369
0a55d8eb194e Configuration/Lua to select the accepted C-Store SCP transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1163 diff changeset	370 default:
0a55d8eb194e Configuration/Lua to select the accepted C-Store SCP transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1163 diff changeset	371 throw OrthancException(ErrorCode_ParameterOutOfRange);
0a55d8eb194e Configuration/Lua to select the accepted C-Store SCP transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1163 diff changeset	372 }
0a55d8eb194e Configuration/Lua to select the accepted C-Store SCP transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1163 diff changeset	373
0a55d8eb194e Configuration/Lua to select the accepted C-Store SCP transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1163 diff changeset	374 {
2616 2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2612 diff changeset	375 std::string name = "Is" + configuration;
1164 0a55d8eb194e Configuration/Lua to select the accepted C-Store SCP transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1163 diff changeset	376
2617 912a767911b0 back to a single Lua context Sebastien Jodogne <s.jodogne@gmail.com> parents: 2616 diff changeset	377 LuaScripting::Lock lock(context_.GetLuaScripting());
1164 0a55d8eb194e Configuration/Lua to select the accepted C-Store SCP transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1163 diff changeset	378
2616 2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2612 diff changeset	379 if (lock.GetLua().IsExistingFunction(name.c_str()))
1164 0a55d8eb194e Configuration/Lua to select the accepted C-Store SCP transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1163 diff changeset	380 {
2616 2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2612 diff changeset	381 LuaFunctionCall call(lock.GetLua(), name.c_str());
1799 4f01c9d73f02 calledAet made available to all the handlers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1797 diff changeset	382 call.PushString(remoteAet);
4f01c9d73f02 calledAet made available to all the handlers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1797 diff changeset	383 call.PushString(remoteIp);
1806 cd213ebcaefd UnknownSopClassAccepted option Sebastien Jodogne <s.jodogne@gmail.com> parents: 1802 diff changeset	384 call.PushString(calledAet);
cd213ebcaefd UnknownSopClassAccepted option Sebastien Jodogne <s.jodogne@gmail.com> parents: 1802 diff changeset	385 return call.ExecutePredicate();
cd213ebcaefd UnknownSopClassAccepted option Sebastien Jodogne <s.jodogne@gmail.com> parents: 1802 diff changeset	386 }
cd213ebcaefd UnknownSopClassAccepted option Sebastien Jodogne <s.jodogne@gmail.com> parents: 1802 diff changeset	387 }
cd213ebcaefd UnknownSopClassAccepted option Sebastien Jodogne <s.jodogne@gmail.com> parents: 1802 diff changeset	388
2940 4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2903 diff changeset	389 {
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2903 diff changeset	390 OrthancConfiguration::ReaderLock lock;
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2903 diff changeset	391 return lock.GetConfiguration().GetBooleanParameter(configuration, true);
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2903 diff changeset	392 }
1806 cd213ebcaefd UnknownSopClassAccepted option Sebastien Jodogne <s.jodogne@gmail.com> parents: 1802 diff changeset	393 }
cd213ebcaefd UnknownSopClassAccepted option Sebastien Jodogne <s.jodogne@gmail.com> parents: 1802 diff changeset	394
cd213ebcaefd UnknownSopClassAccepted option Sebastien Jodogne <s.jodogne@gmail.com> parents: 1802 diff changeset	395
cd213ebcaefd UnknownSopClassAccepted option Sebastien Jodogne <s.jodogne@gmail.com> parents: 1802 diff changeset	396 virtual bool IsUnknownSopClassAccepted(const std::string& remoteIp,
cd213ebcaefd UnknownSopClassAccepted option Sebastien Jodogne <s.jodogne@gmail.com> parents: 1802 diff changeset	397 const std::string& remoteAet,
cd213ebcaefd UnknownSopClassAccepted option Sebastien Jodogne <s.jodogne@gmail.com> parents: 1802 diff changeset	398 const std::string& calledAet)
cd213ebcaefd UnknownSopClassAccepted option Sebastien Jodogne <s.jodogne@gmail.com> parents: 1802 diff changeset	399 {
cd213ebcaefd UnknownSopClassAccepted option Sebastien Jodogne <s.jodogne@gmail.com> parents: 1802 diff changeset	400 static const char* configuration = "UnknownSopClassAccepted";
cd213ebcaefd UnknownSopClassAccepted option Sebastien Jodogne <s.jodogne@gmail.com> parents: 1802 diff changeset	401
cd213ebcaefd UnknownSopClassAccepted option Sebastien Jodogne <s.jodogne@gmail.com> parents: 1802 diff changeset	402 {
cd213ebcaefd UnknownSopClassAccepted option Sebastien Jodogne <s.jodogne@gmail.com> parents: 1802 diff changeset	403 std::string lua = "Is" + std::string(configuration);
cd213ebcaefd UnknownSopClassAccepted option Sebastien Jodogne <s.jodogne@gmail.com> parents: 1802 diff changeset	404
2617 912a767911b0 back to a single Lua context Sebastien Jodogne <s.jodogne@gmail.com> parents: 2616 diff changeset	405 LuaScripting::Lock lock(context_.GetLuaScripting());
1806 cd213ebcaefd UnknownSopClassAccepted option Sebastien Jodogne <s.jodogne@gmail.com> parents: 1802 diff changeset	406
2616 2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2612 diff changeset	407 if (lock.GetLua().IsExistingFunction(lua.c_str()))
1806 cd213ebcaefd UnknownSopClassAccepted option Sebastien Jodogne <s.jodogne@gmail.com> parents: 1802 diff changeset	408 {
2616 2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2612 diff changeset	409 LuaFunctionCall call(lock.GetLua(), lua.c_str());
1806 cd213ebcaefd UnknownSopClassAccepted option Sebastien Jodogne <s.jodogne@gmail.com> parents: 1802 diff changeset	410 call.PushString(remoteAet);
cd213ebcaefd UnknownSopClassAccepted option Sebastien Jodogne <s.jodogne@gmail.com> parents: 1802 diff changeset	411 call.PushString(remoteIp);
cd213ebcaefd UnknownSopClassAccepted option Sebastien Jodogne <s.jodogne@gmail.com> parents: 1802 diff changeset	412 call.PushString(calledAet);
1164 0a55d8eb194e Configuration/Lua to select the accepted C-Store SCP transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1163 diff changeset	413 return call.ExecutePredicate();
0a55d8eb194e Configuration/Lua to select the accepted C-Store SCP transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1163 diff changeset	414 }
0a55d8eb194e Configuration/Lua to select the accepted C-Store SCP transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1163 diff changeset	415 }
0a55d8eb194e Configuration/Lua to select the accepted C-Store SCP transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1163 diff changeset	416
2940 4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2903 diff changeset	417 {
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2903 diff changeset	418 OrthancConfiguration::ReaderLock lock;
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2903 diff changeset	419 return lock.GetConfiguration().GetBooleanParameter(configuration, false);
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2903 diff changeset	420 }
1163 3db41779d8f9 abstraction to allow/prevent transfer syntaxes on AET basis Sebastien Jodogne <s.jodogne@gmail.com> parents: 1135 diff changeset	421 }
618 5ab377df6d8b filtering on aet Sebastien Jodogne <s.jodogne@gmail.com> parents: 614 diff changeset	422 };
5ab377df6d8b filtering on aet Sebastien Jodogne <s.jodogne@gmail.com> parents: 614 diff changeset	423
5ab377df6d8b filtering on aet Sebastien Jodogne <s.jodogne@gmail.com> parents: 614 diff changeset	424
409 63f707278fc8 lua filtering of incoming http requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 407 diff changeset	425 class MyIncomingHttpRequestFilter : public IIncomingHttpRequestFilter
63f707278fc8 lua filtering of incoming http requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 407 diff changeset	426 {
63f707278fc8 lua filtering of incoming http requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 407 diff changeset	427 private:
2617 912a767911b0 back to a single Lua context Sebastien Jodogne <s.jodogne@gmail.com> parents: 2616 diff changeset	428 ServerContext& context_;
1962 22ddb22fce83 sample plugin Sebastien Jodogne <s.jodogne@gmail.com> parents: 1959 diff changeset	429 OrthancPlugins* plugins_;
409 63f707278fc8 lua filtering of incoming http requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 407 diff changeset	430
63f707278fc8 lua filtering of incoming http requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 407 diff changeset	431 public:
1962 22ddb22fce83 sample plugin Sebastien Jodogne <s.jodogne@gmail.com> parents: 1959 diff changeset	432 MyIncomingHttpRequestFilter(ServerContext& context,
22ddb22fce83 sample plugin Sebastien Jodogne <s.jodogne@gmail.com> parents: 1959 diff changeset	433 OrthancPlugins* plugins) :
22ddb22fce83 sample plugin Sebastien Jodogne <s.jodogne@gmail.com> parents: 1959 diff changeset	434 context_(context),
22ddb22fce83 sample plugin Sebastien Jodogne <s.jodogne@gmail.com> parents: 1959 diff changeset	435 plugins_(plugins)
409 63f707278fc8 lua filtering of incoming http requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 407 diff changeset	436 {
63f707278fc8 lua filtering of incoming http requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 407 diff changeset	437 }
63f707278fc8 lua filtering of incoming http requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 407 diff changeset	438
473 c9a5d72f8481 changing the namespace of HTTP enumerations Sebastien Jodogne <s.jodogne@gmail.com> parents: 426 diff changeset	439 virtual bool IsAllowed(HttpMethod method,
409 63f707278fc8 lua filtering of incoming http requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 407 diff changeset	440 const char* uri,
63f707278fc8 lua filtering of incoming http requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 407 diff changeset	441 const char* ip,
1959 45c4387a379c Access to the HTTP headers in the "IncomingHttpRequestFilter()" callback Sebastien Jodogne <s.jodogne@gmail.com> parents: 1949 diff changeset	442 const char* username,
2268 ce5c13b95dac New function: OrthancPluginRegisterIncomingHttpRequestFilter2() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2246 diff changeset	443 const IHttpHandler::Arguments& httpHeaders,
2616 2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2612 diff changeset	444 const IHttpHandler::GetArguments& getArguments)
409 63f707278fc8 lua filtering of incoming http requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 407 diff changeset	445 {
3048 8b331be57606 fix build without plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2955 diff changeset	446 #if ORTHANC_ENABLE_PLUGINS == 1
1962 22ddb22fce83 sample plugin Sebastien Jodogne <s.jodogne@gmail.com> parents: 1959 diff changeset	447 if (plugins_ != NULL &&
2268 ce5c13b95dac New function: OrthancPluginRegisterIncomingHttpRequestFilter2() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2246 diff changeset	448 !plugins_->IsAllowed(method, uri, ip, username, httpHeaders, getArguments))
1962 22ddb22fce83 sample plugin Sebastien Jodogne <s.jodogne@gmail.com> parents: 1959 diff changeset	449 {
22ddb22fce83 sample plugin Sebastien Jodogne <s.jodogne@gmail.com> parents: 1959 diff changeset	450 return false;
22ddb22fce83 sample plugin Sebastien Jodogne <s.jodogne@gmail.com> parents: 1959 diff changeset	451 }
3048 8b331be57606 fix build without plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2955 diff changeset	452 #endif
1962 22ddb22fce83 sample plugin Sebastien Jodogne <s.jodogne@gmail.com> parents: 1959 diff changeset	453
409 63f707278fc8 lua filtering of incoming http requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 407 diff changeset	454 static const char* HTTP_FILTER = "IncomingHttpRequestFilter";
63f707278fc8 lua filtering of incoming http requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 407 diff changeset	455
2617 912a767911b0 back to a single Lua context Sebastien Jodogne <s.jodogne@gmail.com> parents: 2616 diff changeset	456 LuaScripting::Lock lock(context_.GetLuaScripting());
996 cf52f3bcb2b3 clarification of Lua classes wrt multithreading Sebastien Jodogne <s.jodogne@gmail.com> parents: 941 diff changeset	457
409 63f707278fc8 lua filtering of incoming http requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 407 diff changeset	458 // Test if the instance must be filtered out
2616 2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2612 diff changeset	459 if (lock.GetLua().IsExistingFunction(HTTP_FILTER))
409 63f707278fc8 lua filtering of incoming http requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 407 diff changeset	460 {
2616 2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2612 diff changeset	461 LuaFunctionCall call(lock.GetLua(), HTTP_FILTER);
409 63f707278fc8 lua filtering of incoming http requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 407 diff changeset	462
63f707278fc8 lua filtering of incoming http requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 407 diff changeset	463 switch (method)
63f707278fc8 lua filtering of incoming http requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 407 diff changeset	464 {
473 c9a5d72f8481 changing the namespace of HTTP enumerations Sebastien Jodogne <s.jodogne@gmail.com> parents: 426 diff changeset	465 case HttpMethod_Get:
409 63f707278fc8 lua filtering of incoming http requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 407 diff changeset	466 call.PushString("GET");
63f707278fc8 lua filtering of incoming http requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 407 diff changeset	467 break;
63f707278fc8 lua filtering of incoming http requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 407 diff changeset	468
473 c9a5d72f8481 changing the namespace of HTTP enumerations Sebastien Jodogne <s.jodogne@gmail.com> parents: 426 diff changeset	469 case HttpMethod_Put:
409 63f707278fc8 lua filtering of incoming http requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 407 diff changeset	470 call.PushString("PUT");
63f707278fc8 lua filtering of incoming http requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 407 diff changeset	471 break;
63f707278fc8 lua filtering of incoming http requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 407 diff changeset	472
473 c9a5d72f8481 changing the namespace of HTTP enumerations Sebastien Jodogne <s.jodogne@gmail.com> parents: 426 diff changeset	473 case HttpMethod_Post:
409 63f707278fc8 lua filtering of incoming http requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 407 diff changeset	474 call.PushString("POST");
63f707278fc8 lua filtering of incoming http requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 407 diff changeset	475 break;
63f707278fc8 lua filtering of incoming http requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 407 diff changeset	476
473 c9a5d72f8481 changing the namespace of HTTP enumerations Sebastien Jodogne <s.jodogne@gmail.com> parents: 426 diff changeset	477 case HttpMethod_Delete:
409 63f707278fc8 lua filtering of incoming http requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 407 diff changeset	478 call.PushString("DELETE");
63f707278fc8 lua filtering of incoming http requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 407 diff changeset	479 break;
63f707278fc8 lua filtering of incoming http requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 407 diff changeset	480
63f707278fc8 lua filtering of incoming http requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 407 diff changeset	481 default:
63f707278fc8 lua filtering of incoming http requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 407 diff changeset	482 return true;
63f707278fc8 lua filtering of incoming http requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 407 diff changeset	483 }
63f707278fc8 lua filtering of incoming http requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 407 diff changeset	484
63f707278fc8 lua filtering of incoming http requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 407 diff changeset	485 call.PushString(uri);
63f707278fc8 lua filtering of incoming http requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 407 diff changeset	486 call.PushString(ip);
63f707278fc8 lua filtering of incoming http requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 407 diff changeset	487 call.PushString(username);
1959 45c4387a379c Access to the HTTP headers in the "IncomingHttpRequestFilter()" callback Sebastien Jodogne <s.jodogne@gmail.com> parents: 1949 diff changeset	488 call.PushStringMap(httpHeaders);
409 63f707278fc8 lua filtering of incoming http requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 407 diff changeset	489
63f707278fc8 lua filtering of incoming http requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 407 diff changeset	490 if (!call.ExecutePredicate())
63f707278fc8 lua filtering of incoming http requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 407 diff changeset	491 {
63f707278fc8 lua filtering of incoming http requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 407 diff changeset	492 LOG(INFO) << "An incoming HTTP request has been discarded by the filter";
63f707278fc8 lua filtering of incoming http requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 407 diff changeset	493 return false;
63f707278fc8 lua filtering of incoming http requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 407 diff changeset	494 }
63f707278fc8 lua filtering of incoming http requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 407 diff changeset	495 }
63f707278fc8 lua filtering of incoming http requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 407 diff changeset	496
63f707278fc8 lua filtering of incoming http requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 407 diff changeset	497 return true;
63f707278fc8 lua filtering of incoming http requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 407 diff changeset	498 }
63f707278fc8 lua filtering of incoming http requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 407 diff changeset	499 };
63f707278fc8 lua filtering of incoming http requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 407 diff changeset	500
63f707278fc8 lua filtering of incoming http requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 407 diff changeset	501
1645 1558b3226b18 IHttpExceptionFormatter Sebastien Jodogne <s.jodogne@gmail.com> parents: 1632 diff changeset	502
1558b3226b18 IHttpExceptionFormatter Sebastien Jodogne <s.jodogne@gmail.com> parents: 1632 diff changeset	503 class MyHttpExceptionFormatter : public IHttpExceptionFormatter
1558b3226b18 IHttpExceptionFormatter Sebastien Jodogne <s.jodogne@gmail.com> parents: 1632 diff changeset	504 {
1558b3226b18 IHttpExceptionFormatter Sebastien Jodogne <s.jodogne@gmail.com> parents: 1632 diff changeset	505 private:
1558b3226b18 IHttpExceptionFormatter Sebastien Jodogne <s.jodogne@gmail.com> parents: 1632 diff changeset	506 bool describeErrors_;
1558b3226b18 IHttpExceptionFormatter Sebastien Jodogne <s.jodogne@gmail.com> parents: 1632 diff changeset	507 OrthancPlugins* plugins_;
1558b3226b18 IHttpExceptionFormatter Sebastien Jodogne <s.jodogne@gmail.com> parents: 1632 diff changeset	508
1558b3226b18 IHttpExceptionFormatter Sebastien Jodogne <s.jodogne@gmail.com> parents: 1632 diff changeset	509 public:
1558b3226b18 IHttpExceptionFormatter Sebastien Jodogne <s.jodogne@gmail.com> parents: 1632 diff changeset	510 MyHttpExceptionFormatter(bool describeErrors,
1558b3226b18 IHttpExceptionFormatter Sebastien Jodogne <s.jodogne@gmail.com> parents: 1632 diff changeset	511 OrthancPlugins* plugins) :
1558b3226b18 IHttpExceptionFormatter Sebastien Jodogne <s.jodogne@gmail.com> parents: 1632 diff changeset	512 describeErrors_(describeErrors),
1558b3226b18 IHttpExceptionFormatter Sebastien Jodogne <s.jodogne@gmail.com> parents: 1632 diff changeset	513 plugins_(plugins)
1558b3226b18 IHttpExceptionFormatter Sebastien Jodogne <s.jodogne@gmail.com> parents: 1632 diff changeset	514 {
1558b3226b18 IHttpExceptionFormatter Sebastien Jodogne <s.jodogne@gmail.com> parents: 1632 diff changeset	515 }
1558b3226b18 IHttpExceptionFormatter Sebastien Jodogne <s.jodogne@gmail.com> parents: 1632 diff changeset	516
1558b3226b18 IHttpExceptionFormatter Sebastien Jodogne <s.jodogne@gmail.com> parents: 1632 diff changeset	517 virtual void Format(HttpOutput& output,
1558b3226b18 IHttpExceptionFormatter Sebastien Jodogne <s.jodogne@gmail.com> parents: 1632 diff changeset	518 const OrthancException& exception,
1558b3226b18 IHttpExceptionFormatter Sebastien Jodogne <s.jodogne@gmail.com> parents: 1632 diff changeset	519 HttpMethod method,
1558b3226b18 IHttpExceptionFormatter Sebastien Jodogne <s.jodogne@gmail.com> parents: 1632 diff changeset	520 const char* uri)
1558b3226b18 IHttpExceptionFormatter Sebastien Jodogne <s.jodogne@gmail.com> parents: 1632 diff changeset	521 {
1650 9f34ebfaf2c9 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1649 diff changeset	522 {
9f34ebfaf2c9 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1649 diff changeset	523 bool isPlugin = false;
9f34ebfaf2c9 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1649 diff changeset	524
2136 dd609a99d39a uniformization of the macro naming Sebastien Jodogne <s.jodogne@gmail.com> parents: 2133 diff changeset	525 #if ORTHANC_ENABLE_PLUGINS == 1
1650 9f34ebfaf2c9 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1649 diff changeset	526 if (plugins_ != NULL)
9f34ebfaf2c9 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1649 diff changeset	527 {
1651 2e692c83e2f3 improved custom error login Sebastien Jodogne <s.jodogne@gmail.com> parents: 1650 diff changeset	528 plugins_->GetErrorDictionary().LogError(exception.GetErrorCode(), true);
1650 9f34ebfaf2c9 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1649 diff changeset	529 isPlugin = true;
9f34ebfaf2c9 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1649 diff changeset	530 }
9f34ebfaf2c9 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1649 diff changeset	531 #endif
9f34ebfaf2c9 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1649 diff changeset	532
9f34ebfaf2c9 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1649 diff changeset	533 if (!isPlugin)
9f34ebfaf2c9 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1649 diff changeset	534 {
9f34ebfaf2c9 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1649 diff changeset	535 LOG(ERROR) << "Exception in the HTTP handler: " << exception.What();
9f34ebfaf2c9 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1649 diff changeset	536 }
9f34ebfaf2c9 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1649 diff changeset	537 }
9f34ebfaf2c9 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1649 diff changeset	538
1645 1558b3226b18 IHttpExceptionFormatter Sebastien Jodogne <s.jodogne@gmail.com> parents: 1632 diff changeset	539 Json::Value message = Json::objectValue;
1558b3226b18 IHttpExceptionFormatter Sebastien Jodogne <s.jodogne@gmail.com> parents: 1632 diff changeset	540 ErrorCode errorCode = exception.GetErrorCode();
1558b3226b18 IHttpExceptionFormatter Sebastien Jodogne <s.jodogne@gmail.com> parents: 1632 diff changeset	541 HttpStatus httpStatus = exception.GetHttpStatus();
1558b3226b18 IHttpExceptionFormatter Sebastien Jodogne <s.jodogne@gmail.com> parents: 1632 diff changeset	542
1649 8040d56cb0b3 New function "OrthancPluginRegisterErrorCode()" to declare custom error codes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1645 diff changeset	543 {
8040d56cb0b3 New function "OrthancPluginRegisterErrorCode()" to declare custom error codes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1645 diff changeset	544 bool isPlugin = false;
1645 1558b3226b18 IHttpExceptionFormatter Sebastien Jodogne <s.jodogne@gmail.com> parents: 1632 diff changeset	545
2136 dd609a99d39a uniformization of the macro naming Sebastien Jodogne <s.jodogne@gmail.com> parents: 2133 diff changeset	546 #if ORTHANC_ENABLE_PLUGINS == 1
1649 8040d56cb0b3 New function "OrthancPluginRegisterErrorCode()" to declare custom error codes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1645 diff changeset	547 if (plugins_ != NULL &&
8040d56cb0b3 New function "OrthancPluginRegisterErrorCode()" to declare custom error codes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1645 diff changeset	548 plugins_->GetErrorDictionary().Format(message, httpStatus, exception))
8040d56cb0b3 New function "OrthancPluginRegisterErrorCode()" to declare custom error codes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1645 diff changeset	549 {
8040d56cb0b3 New function "OrthancPluginRegisterErrorCode()" to declare custom error codes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1645 diff changeset	550 errorCode = ErrorCode_Plugin;
8040d56cb0b3 New function "OrthancPluginRegisterErrorCode()" to declare custom error codes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1645 diff changeset	551 isPlugin = true;
8040d56cb0b3 New function "OrthancPluginRegisterErrorCode()" to declare custom error codes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1645 diff changeset	552 }
1645 1558b3226b18 IHttpExceptionFormatter Sebastien Jodogne <s.jodogne@gmail.com> parents: 1632 diff changeset	553 #endif
1558b3226b18 IHttpExceptionFormatter Sebastien Jodogne <s.jodogne@gmail.com> parents: 1632 diff changeset	554
1649 8040d56cb0b3 New function "OrthancPluginRegisterErrorCode()" to declare custom error codes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1645 diff changeset	555 if (!isPlugin)
8040d56cb0b3 New function "OrthancPluginRegisterErrorCode()" to declare custom error codes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1645 diff changeset	556 {
8040d56cb0b3 New function "OrthancPluginRegisterErrorCode()" to declare custom error codes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1645 diff changeset	557 message["Message"] = exception.What();
8040d56cb0b3 New function "OrthancPluginRegisterErrorCode()" to declare custom error codes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1645 diff changeset	558 }
1645 1558b3226b18 IHttpExceptionFormatter Sebastien Jodogne <s.jodogne@gmail.com> parents: 1632 diff changeset	559 }
1558b3226b18 IHttpExceptionFormatter Sebastien Jodogne <s.jodogne@gmail.com> parents: 1632 diff changeset	560
1649 8040d56cb0b3 New function "OrthancPluginRegisterErrorCode()" to declare custom error codes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1645 diff changeset	561 if (!describeErrors_)
8040d56cb0b3 New function "OrthancPluginRegisterErrorCode()" to declare custom error codes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1645 diff changeset	562 {
8040d56cb0b3 New function "OrthancPluginRegisterErrorCode()" to declare custom error codes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1645 diff changeset	563 output.SendStatus(httpStatus);
8040d56cb0b3 New function "OrthancPluginRegisterErrorCode()" to declare custom error codes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1645 diff changeset	564 }
8040d56cb0b3 New function "OrthancPluginRegisterErrorCode()" to declare custom error codes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1645 diff changeset	565 else
8040d56cb0b3 New function "OrthancPluginRegisterErrorCode()" to declare custom error codes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1645 diff changeset	566 {
8040d56cb0b3 New function "OrthancPluginRegisterErrorCode()" to declare custom error codes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1645 diff changeset	567 message["Method"] = EnumerationToString(method);
8040d56cb0b3 New function "OrthancPluginRegisterErrorCode()" to declare custom error codes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1645 diff changeset	568 message["Uri"] = uri;
8040d56cb0b3 New function "OrthancPluginRegisterErrorCode()" to declare custom error codes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1645 diff changeset	569 message["HttpError"] = EnumerationToString(httpStatus);
8040d56cb0b3 New function "OrthancPluginRegisterErrorCode()" to declare custom error codes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1645 diff changeset	570 message["HttpStatus"] = httpStatus;
8040d56cb0b3 New function "OrthancPluginRegisterErrorCode()" to declare custom error codes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1645 diff changeset	571 message["OrthancError"] = EnumerationToString(errorCode);
8040d56cb0b3 New function "OrthancPluginRegisterErrorCode()" to declare custom error codes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1645 diff changeset	572 message["OrthancStatus"] = errorCode;
1645 1558b3226b18 IHttpExceptionFormatter Sebastien Jodogne <s.jodogne@gmail.com> parents: 1632 diff changeset	573
2952 4ceb9bf7b00c added details string in OrthancException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2950 diff changeset	574 if (exception.HasDetails())
4ceb9bf7b00c added details string in OrthancException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2950 diff changeset	575 {
4ceb9bf7b00c added details string in OrthancException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2950 diff changeset	576 message["Details"] = exception.GetDetails();
4ceb9bf7b00c added details string in OrthancException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2950 diff changeset	577 }
4ceb9bf7b00c added details string in OrthancException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2950 diff changeset	578
1649 8040d56cb0b3 New function "OrthancPluginRegisterErrorCode()" to declare custom error codes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1645 diff changeset	579 std::string info = message.toStyledString();
8040d56cb0b3 New function "OrthancPluginRegisterErrorCode()" to declare custom error codes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1645 diff changeset	580 output.SendStatus(httpStatus, info);
8040d56cb0b3 New function "OrthancPluginRegisterErrorCode()" to declare custom error codes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1645 diff changeset	581 }
1645 1558b3226b18 IHttpExceptionFormatter Sebastien Jodogne <s.jodogne@gmail.com> parents: 1632 diff changeset	582 }
1558b3226b18 IHttpExceptionFormatter Sebastien Jodogne <s.jodogne@gmail.com> parents: 1632 diff changeset	583 };
1558b3226b18 IHttpExceptionFormatter Sebastien Jodogne <s.jodogne@gmail.com> parents: 1632 diff changeset	584
1558b3226b18 IHttpExceptionFormatter Sebastien Jodogne <s.jodogne@gmail.com> parents: 1632 diff changeset	585
1558b3226b18 IHttpExceptionFormatter Sebastien Jodogne <s.jodogne@gmail.com> parents: 1632 diff changeset	586
1733 e1f5ab395297 PrintErrors Sebastien Jodogne <s.jodogne@gmail.com> parents: 1730 diff changeset	587 static void PrintHelp(const char* path)
133 1969ff16457c help Sebastien Jodogne <s.jodogne@gmail.com> parents: 128 diff changeset	588 {
1969ff16457c help Sebastien Jodogne <s.jodogne@gmail.com> parents: 128 diff changeset	589 std::cout
1969ff16457c help Sebastien Jodogne <s.jodogne@gmail.com> parents: 128 diff changeset	590 << "Usage: " << path << " [OPTION]... [CONFIGURATION]" << std::endl
175 662af781a227 sample config file from command line Sebastien Jodogne <s.jodogne@gmail.com> parents: 158 diff changeset	591 << "Orthanc, lightweight, RESTful DICOM server for healthcare and medical research." << std::endl
133 1969ff16457c help Sebastien Jodogne <s.jodogne@gmail.com> parents: 128 diff changeset	592 << std::endl
1666 d7039be97eeb better command-line options handling Sebastien Jodogne <s.jodogne@gmail.com> parents: 1651 diff changeset	593 << "The \"CONFIGURATION\" argument can be a single file or a directory. In the " << std::endl
d7039be97eeb better command-line options handling Sebastien Jodogne <s.jodogne@gmail.com> parents: 1651 diff changeset	594 << "case of a directory, all the JSON files it contains will be merged. " << std::endl
d7039be97eeb better command-line options handling Sebastien Jodogne <s.jodogne@gmail.com> parents: 1651 diff changeset	595 << "If no configuration path is given on the command line, a set of default " << std::endl
175 662af781a227 sample config file from command line Sebastien Jodogne <s.jodogne@gmail.com> parents: 158 diff changeset	596 << "parameters is used. Please refer to the Orthanc homepage for the full " << std::endl
1615 c40fe92a68e7 Primitives to upgrade the database version in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1592 diff changeset	597 << "instructions about how to use Orthanc <http://www.orthanc-server.com/>." << std::endl
133 1969ff16457c help Sebastien Jodogne <s.jodogne@gmail.com> parents: 128 diff changeset	598 << std::endl
1969ff16457c help Sebastien Jodogne <s.jodogne@gmail.com> parents: 128 diff changeset	599 << "Command-line options:" << std::endl
1969ff16457c help Sebastien Jodogne <s.jodogne@gmail.com> parents: 128 diff changeset	600 << " --help\t\tdisplay this help and exit" << std::endl
1969ff16457c help Sebastien Jodogne <s.jodogne@gmail.com> parents: 128 diff changeset	601 << " --logdir=[dir]\tdirectory where to store the log files" << std::endl
2015 bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2010 diff changeset	602 << "\t\t\t(by default, the log is dumped to stderr)" << std::endl
bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2010 diff changeset	603 << " --logfile=[file]\tfile where to store the log of Orthanc" << std::endl
bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2010 diff changeset	604 << "\t\t\t(by default, the log is dumped to stderr)" << std::endl
175 662af781a227 sample config file from command line Sebastien Jodogne <s.jodogne@gmail.com> parents: 158 diff changeset	605 << " --config=[file]\tcreate a sample configuration file and exit" << std::endl
3526 f07352e0375c new configuration option ExecuteLuaEnabled Sebastien Jodogne <s.jodogne@gmail.com> parents: 3506 diff changeset	606 << "\t\t\t(if file is \"-\", dumps to stdout)" << std::endl
1733 e1f5ab395297 PrintErrors Sebastien Jodogne <s.jodogne@gmail.com> parents: 1730 diff changeset	607 << " --errors\t\tprint the supported error codes and exit" << std::endl
1615 c40fe92a68e7 Primitives to upgrade the database version in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1592 diff changeset	608 << " --verbose\t\tbe verbose in logs" << std::endl
175 662af781a227 sample config file from command line Sebastien Jodogne <s.jodogne@gmail.com> parents: 158 diff changeset	609 << " --trace\t\thighest verbosity in logs (for debug)" << std::endl
1615 c40fe92a68e7 Primitives to upgrade the database version in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1592 diff changeset	610 << " --upgrade\t\tallow Orthanc to upgrade the version of the" << std::endl
c40fe92a68e7 Primitives to upgrade the database version in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1592 diff changeset	611 << "\t\t\tdatabase (beware that the database will become" << std::endl
c40fe92a68e7 Primitives to upgrade the database version in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1592 diff changeset	612 << "\t\t\tincompatible with former versions of Orthanc)" << std::endl
2671 06c0a6b8a871 new command-line argument: --no-jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	613 << " --no-jobs\t\tDon't restart the jobs that were stored during" << std::endl
06c0a6b8a871 new command-line argument: --no-jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	614 << "\t\t\tthe last execution of Orthanc" << std::endl
175 662af781a227 sample config file from command line Sebastien Jodogne <s.jodogne@gmail.com> parents: 158 diff changeset	615 << " --version\t\toutput version information and exit" << std::endl
133 1969ff16457c help Sebastien Jodogne <s.jodogne@gmail.com> parents: 128 diff changeset	616 << std::endl
1969ff16457c help Sebastien Jodogne <s.jodogne@gmail.com> parents: 128 diff changeset	617 << "Exit status:" << std::endl
1615 c40fe92a68e7 Primitives to upgrade the database version in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1592 diff changeset	618 << " 0 if success," << std::endl
1733 e1f5ab395297 PrintErrors Sebastien Jodogne <s.jodogne@gmail.com> parents: 1730 diff changeset	619 #if defined(_WIN32)
e1f5ab395297 PrintErrors Sebastien Jodogne <s.jodogne@gmail.com> parents: 1730 diff changeset	620 << "!= 0 if error (use the --errors option to get the list of possible errors)." << std::endl
e1f5ab395297 PrintErrors Sebastien Jodogne <s.jodogne@gmail.com> parents: 1730 diff changeset	621 #else
1615 c40fe92a68e7 Primitives to upgrade the database version in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1592 diff changeset	622 << " -1 if error (have a look at the logs)." << std::endl
1733 e1f5ab395297 PrintErrors Sebastien Jodogne <s.jodogne@gmail.com> parents: 1730 diff changeset	623 #endif
133 1969ff16457c help Sebastien Jodogne <s.jodogne@gmail.com> parents: 128 diff changeset	624 << std::endl;
1969ff16457c help Sebastien Jodogne <s.jodogne@gmail.com> parents: 128 diff changeset	625 }
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	626
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	627
1733 e1f5ab395297 PrintErrors Sebastien Jodogne <s.jodogne@gmail.com> parents: 1730 diff changeset	628 static void PrintVersion(const char* path)
133 1969ff16457c help Sebastien Jodogne <s.jodogne@gmail.com> parents: 128 diff changeset	629 {
1969ff16457c help Sebastien Jodogne <s.jodogne@gmail.com> parents: 128 diff changeset	630 std::cout
1969ff16457c help Sebastien Jodogne <s.jodogne@gmail.com> parents: 128 diff changeset	631 << path << " " << ORTHANC_VERSION << std::endl
1900 b1291df2f780 2016 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1872 diff changeset	632 << "Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics Department, University Hospital of Liege (Belgium)" << std::endl
3640 94f4a18a79cc upgrade to year 2020 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3537 diff changeset	633 << "Copyright (C) 2017-2020 Osimis S.A. (Belgium)" << std::endl
133 1969ff16457c help Sebastien Jodogne <s.jodogne@gmail.com> parents: 128 diff changeset	634 << "Licensing GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>, with OpenSSL exception." << std::endl
1969ff16457c help Sebastien Jodogne <s.jodogne@gmail.com> parents: 128 diff changeset	635 << "This is free software: you are free to change and redistribute it." << std::endl
1969ff16457c help Sebastien Jodogne <s.jodogne@gmail.com> parents: 128 diff changeset	636 << "There is NO WARRANTY, to the extent permitted by law." << std::endl
1969ff16457c help Sebastien Jodogne <s.jodogne@gmail.com> parents: 128 diff changeset	637 << std::endl
3063 fa5ad4368fe3 new mail address Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	638 << "Written by Sebastien Jodogne <s.jodogne@orthanc-labs.com>" << std::endl;
133 1969ff16457c help Sebastien Jodogne <s.jodogne@gmail.com> parents: 128 diff changeset	639 }
1969ff16457c help Sebastien Jodogne <s.jodogne@gmail.com> parents: 128 diff changeset	640
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	641
1733 e1f5ab395297 PrintErrors Sebastien Jodogne <s.jodogne@gmail.com> parents: 1730 diff changeset	642 static void PrintErrorCode(ErrorCode code, const char* description)
e1f5ab395297 PrintErrors Sebastien Jodogne <s.jodogne@gmail.com> parents: 1730 diff changeset	643 {
e1f5ab395297 PrintErrors Sebastien Jodogne <s.jodogne@gmail.com> parents: 1730 diff changeset	644 std::cout
e1f5ab395297 PrintErrors Sebastien Jodogne <s.jodogne@gmail.com> parents: 1730 diff changeset	645 << std::right << std::setw(16)
e1f5ab395297 PrintErrors Sebastien Jodogne <s.jodogne@gmail.com> parents: 1730 diff changeset	646 << static_cast<int>(code)
e1f5ab395297 PrintErrors Sebastien Jodogne <s.jodogne@gmail.com> parents: 1730 diff changeset	647 << " " << description << std::endl;
e1f5ab395297 PrintErrors Sebastien Jodogne <s.jodogne@gmail.com> parents: 1730 diff changeset	648 }
e1f5ab395297 PrintErrors Sebastien Jodogne <s.jodogne@gmail.com> parents: 1730 diff changeset	649
e1f5ab395297 PrintErrors Sebastien Jodogne <s.jodogne@gmail.com> parents: 1730 diff changeset	650
e1f5ab395297 PrintErrors Sebastien Jodogne <s.jodogne@gmail.com> parents: 1730 diff changeset	651 static void PrintErrors(const char* path)
e1f5ab395297 PrintErrors Sebastien Jodogne <s.jodogne@gmail.com> parents: 1730 diff changeset	652 {
e1f5ab395297 PrintErrors Sebastien Jodogne <s.jodogne@gmail.com> parents: 1730 diff changeset	653 std::cout
e1f5ab395297 PrintErrors Sebastien Jodogne <s.jodogne@gmail.com> parents: 1730 diff changeset	654 << path << " " << ORTHANC_VERSION << std::endl
1734 e2675b37eb01 Under Windows, the exit status of Orthanc corresponds to the encountered error code Sebastien Jodogne <s.jodogne@gmail.com> parents: 1733 diff changeset	655 << "Orthanc, lightweight, RESTful DICOM server for healthcare and medical research."
e2675b37eb01 Under Windows, the exit status of Orthanc corresponds to the encountered error code Sebastien Jodogne <s.jodogne@gmail.com> parents: 1733 diff changeset	656 << std::endl << std::endl
e2675b37eb01 Under Windows, the exit status of Orthanc corresponds to the encountered error code Sebastien Jodogne <s.jodogne@gmail.com> parents: 1733 diff changeset	657 << "List of error codes that could be returned by Orthanc:"
e2675b37eb01 Under Windows, the exit status of Orthanc corresponds to the encountered error code Sebastien Jodogne <s.jodogne@gmail.com> parents: 1733 diff changeset	658 << std::endl << std::endl;
1733 e1f5ab395297 PrintErrors Sebastien Jodogne <s.jodogne@gmail.com> parents: 1730 diff changeset	659
e1f5ab395297 PrintErrors Sebastien Jodogne <s.jodogne@gmail.com> parents: 1730 diff changeset	660 // The content of the following brackets is automatically generated
e1f5ab395297 PrintErrors Sebastien Jodogne <s.jodogne@gmail.com> parents: 1730 diff changeset	661 // by the "GenerateErrorCodes.py" script
e1f5ab395297 PrintErrors Sebastien Jodogne <s.jodogne@gmail.com> parents: 1730 diff changeset	662 {
1734 e2675b37eb01 Under Windows, the exit status of Orthanc corresponds to the encountered error code Sebastien Jodogne <s.jodogne@gmail.com> parents: 1733 diff changeset	663 PrintErrorCode(ErrorCode_InternalError, "Internal error");
e2675b37eb01 Under Windows, the exit status of Orthanc corresponds to the encountered error code Sebastien Jodogne <s.jodogne@gmail.com> parents: 1733 diff changeset	664 PrintErrorCode(ErrorCode_Success, "Success");
e2675b37eb01 Under Windows, the exit status of Orthanc corresponds to the encountered error code Sebastien Jodogne <s.jodogne@gmail.com> parents: 1733 diff changeset	665 PrintErrorCode(ErrorCode_Plugin, "Error encountered within the plugin engine");
e2675b37eb01 Under Windows, the exit status of Orthanc corresponds to the encountered error code Sebastien Jodogne <s.jodogne@gmail.com> parents: 1733 diff changeset	666 PrintErrorCode(ErrorCode_NotImplemented, "Not implemented yet");
e2675b37eb01 Under Windows, the exit status of Orthanc corresponds to the encountered error code Sebastien Jodogne <s.jodogne@gmail.com> parents: 1733 diff changeset	667 PrintErrorCode(ErrorCode_ParameterOutOfRange, "Parameter out of range");
2133 15ae532af70e fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2132 diff changeset	668 PrintErrorCode(ErrorCode_NotEnoughMemory, "The server hosting Orthanc is running out of memory");
1734 e2675b37eb01 Under Windows, the exit status of Orthanc corresponds to the encountered error code Sebastien Jodogne <s.jodogne@gmail.com> parents: 1733 diff changeset	669 PrintErrorCode(ErrorCode_BadParameterType, "Bad type for a parameter");
e2675b37eb01 Under Windows, the exit status of Orthanc corresponds to the encountered error code Sebastien Jodogne <s.jodogne@gmail.com> parents: 1733 diff changeset	670 PrintErrorCode(ErrorCode_BadSequenceOfCalls, "Bad sequence of calls");
e2675b37eb01 Under Windows, the exit status of Orthanc corresponds to the encountered error code Sebastien Jodogne <s.jodogne@gmail.com> parents: 1733 diff changeset	671 PrintErrorCode(ErrorCode_InexistentItem, "Accessing an inexistent item");
e2675b37eb01 Under Windows, the exit status of Orthanc corresponds to the encountered error code Sebastien Jodogne <s.jodogne@gmail.com> parents: 1733 diff changeset	672 PrintErrorCode(ErrorCode_BadRequest, "Bad request");
e2675b37eb01 Under Windows, the exit status of Orthanc corresponds to the encountered error code Sebastien Jodogne <s.jodogne@gmail.com> parents: 1733 diff changeset	673 PrintErrorCode(ErrorCode_NetworkProtocol, "Error in the network protocol");
e2675b37eb01 Under Windows, the exit status of Orthanc corresponds to the encountered error code Sebastien Jodogne <s.jodogne@gmail.com> parents: 1733 diff changeset	674 PrintErrorCode(ErrorCode_SystemCommand, "Error while calling a system command");
e2675b37eb01 Under Windows, the exit status of Orthanc corresponds to the encountered error code Sebastien Jodogne <s.jodogne@gmail.com> parents: 1733 diff changeset	675 PrintErrorCode(ErrorCode_Database, "Error with the database engine");
e2675b37eb01 Under Windows, the exit status of Orthanc corresponds to the encountered error code Sebastien Jodogne <s.jodogne@gmail.com> parents: 1733 diff changeset	676 PrintErrorCode(ErrorCode_UriSyntax, "Badly formatted URI");
e2675b37eb01 Under Windows, the exit status of Orthanc corresponds to the encountered error code Sebastien Jodogne <s.jodogne@gmail.com> parents: 1733 diff changeset	677 PrintErrorCode(ErrorCode_InexistentFile, "Inexistent file");
e2675b37eb01 Under Windows, the exit status of Orthanc corresponds to the encountered error code Sebastien Jodogne <s.jodogne@gmail.com> parents: 1733 diff changeset	678 PrintErrorCode(ErrorCode_CannotWriteFile, "Cannot write to file");
e2675b37eb01 Under Windows, the exit status of Orthanc corresponds to the encountered error code Sebastien Jodogne <s.jodogne@gmail.com> parents: 1733 diff changeset	679 PrintErrorCode(ErrorCode_BadFileFormat, "Bad file format");
e2675b37eb01 Under Windows, the exit status of Orthanc corresponds to the encountered error code Sebastien Jodogne <s.jodogne@gmail.com> parents: 1733 diff changeset	680 PrintErrorCode(ErrorCode_Timeout, "Timeout");
e2675b37eb01 Under Windows, the exit status of Orthanc corresponds to the encountered error code Sebastien Jodogne <s.jodogne@gmail.com> parents: 1733 diff changeset	681 PrintErrorCode(ErrorCode_UnknownResource, "Unknown resource");
e2675b37eb01 Under Windows, the exit status of Orthanc corresponds to the encountered error code Sebastien Jodogne <s.jodogne@gmail.com> parents: 1733 diff changeset	682 PrintErrorCode(ErrorCode_IncompatibleDatabaseVersion, "Incompatible version of the database");
e2675b37eb01 Under Windows, the exit status of Orthanc corresponds to the encountered error code Sebastien Jodogne <s.jodogne@gmail.com> parents: 1733 diff changeset	683 PrintErrorCode(ErrorCode_FullStorage, "The file storage is full");
e2675b37eb01 Under Windows, the exit status of Orthanc corresponds to the encountered error code Sebastien Jodogne <s.jodogne@gmail.com> parents: 1733 diff changeset	684 PrintErrorCode(ErrorCode_CorruptedFile, "Corrupted file (e.g. inconsistent MD5 hash)");
e2675b37eb01 Under Windows, the exit status of Orthanc corresponds to the encountered error code Sebastien Jodogne <s.jodogne@gmail.com> parents: 1733 diff changeset	685 PrintErrorCode(ErrorCode_InexistentTag, "Inexistent tag");
e2675b37eb01 Under Windows, the exit status of Orthanc corresponds to the encountered error code Sebastien Jodogne <s.jodogne@gmail.com> parents: 1733 diff changeset	686 PrintErrorCode(ErrorCode_ReadOnly, "Cannot modify a read-only data structure");
e2675b37eb01 Under Windows, the exit status of Orthanc corresponds to the encountered error code Sebastien Jodogne <s.jodogne@gmail.com> parents: 1733 diff changeset	687 PrintErrorCode(ErrorCode_IncompatibleImageFormat, "Incompatible format of the images");
e2675b37eb01 Under Windows, the exit status of Orthanc corresponds to the encountered error code Sebastien Jodogne <s.jodogne@gmail.com> parents: 1733 diff changeset	688 PrintErrorCode(ErrorCode_IncompatibleImageSize, "Incompatible size of the images");
e2675b37eb01 Under Windows, the exit status of Orthanc corresponds to the encountered error code Sebastien Jodogne <s.jodogne@gmail.com> parents: 1733 diff changeset	689 PrintErrorCode(ErrorCode_SharedLibrary, "Error while using a shared library (plugin)");
e2675b37eb01 Under Windows, the exit status of Orthanc corresponds to the encountered error code Sebastien Jodogne <s.jodogne@gmail.com> parents: 1733 diff changeset	690 PrintErrorCode(ErrorCode_UnknownPluginService, "Plugin invoking an unknown service");
e2675b37eb01 Under Windows, the exit status of Orthanc corresponds to the encountered error code Sebastien Jodogne <s.jodogne@gmail.com> parents: 1733 diff changeset	691 PrintErrorCode(ErrorCode_UnknownDicomTag, "Unknown DICOM tag");
e2675b37eb01 Under Windows, the exit status of Orthanc corresponds to the encountered error code Sebastien Jodogne <s.jodogne@gmail.com> parents: 1733 diff changeset	692 PrintErrorCode(ErrorCode_BadJson, "Cannot parse a JSON document");
e2675b37eb01 Under Windows, the exit status of Orthanc corresponds to the encountered error code Sebastien Jodogne <s.jodogne@gmail.com> parents: 1733 diff changeset	693 PrintErrorCode(ErrorCode_Unauthorized, "Bad credentials were provided to an HTTP request");
e2675b37eb01 Under Windows, the exit status of Orthanc corresponds to the encountered error code Sebastien Jodogne <s.jodogne@gmail.com> parents: 1733 diff changeset	694 PrintErrorCode(ErrorCode_BadFont, "Badly formatted font file");
e2675b37eb01 Under Windows, the exit status of Orthanc corresponds to the encountered error code Sebastien Jodogne <s.jodogne@gmail.com> parents: 1733 diff changeset	695 PrintErrorCode(ErrorCode_DatabasePlugin, "The plugin implementing a custom database back-end does not fulfill the proper interface");
e2675b37eb01 Under Windows, the exit status of Orthanc corresponds to the encountered error code Sebastien Jodogne <s.jodogne@gmail.com> parents: 1733 diff changeset	696 PrintErrorCode(ErrorCode_StorageAreaPlugin, "Error in the plugin implementing a custom storage area");
1746 d143db00a794 SetOfResources Sebastien Jodogne <s.jodogne@gmail.com> parents: 1741 diff changeset	697 PrintErrorCode(ErrorCode_EmptyRequest, "The request is empty");
1781 5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1746 diff changeset	698 PrintErrorCode(ErrorCode_NotAcceptable, "Cannot send a response which is acceptable according to the Accept HTTP header");
2132 a43708636890 ErrorCode_NotEnoughMemory and ErrorCode_NullPointer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2079 diff changeset	699 PrintErrorCode(ErrorCode_NullPointer, "Cannot handle a NULL pointer");
2486 ad8f30fc28d1 new error code: DatabaseUnavailable Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	700 PrintErrorCode(ErrorCode_DatabaseUnavailable, "The database is currently not available (probably a transient situation)");
2581 8da2cffc2378 JobsRegistry::Cancel() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2572 diff changeset	701 PrintErrorCode(ErrorCode_CanceledJob, "This job was canceled");
3376 56ea9c476dba new error code for Stone: BadGeometry Sebastien Jodogne <s.jodogne@gmail.com> parents: 3180 diff changeset	702 PrintErrorCode(ErrorCode_BadGeometry, "Geometry error encountered in Stone");
3801 9fe1d64a748c upgrade to civetweb 1.12, error reporting if OpenSSL failure Sebastien Jodogne <s.jodogne@gmail.com> parents: 3767 diff changeset	703 PrintErrorCode(ErrorCode_SslInitialization, "Cannot initialize SSL encryption, check out your certificates");
1734 e2675b37eb01 Under Windows, the exit status of Orthanc corresponds to the encountered error code Sebastien Jodogne <s.jodogne@gmail.com> parents: 1733 diff changeset	704 PrintErrorCode(ErrorCode_SQLiteNotOpened, "SQLite: The database is not opened");
e2675b37eb01 Under Windows, the exit status of Orthanc corresponds to the encountered error code Sebastien Jodogne <s.jodogne@gmail.com> parents: 1733 diff changeset	705 PrintErrorCode(ErrorCode_SQLiteAlreadyOpened, "SQLite: Connection is already open");
e2675b37eb01 Under Windows, the exit status of Orthanc corresponds to the encountered error code Sebastien Jodogne <s.jodogne@gmail.com> parents: 1733 diff changeset	706 PrintErrorCode(ErrorCode_SQLiteCannotOpen, "SQLite: Unable to open the database");
e2675b37eb01 Under Windows, the exit status of Orthanc corresponds to the encountered error code Sebastien Jodogne <s.jodogne@gmail.com> parents: 1733 diff changeset	707 PrintErrorCode(ErrorCode_SQLiteStatementAlreadyUsed, "SQLite: This cached statement is already being referred to");
e2675b37eb01 Under Windows, the exit status of Orthanc corresponds to the encountered error code Sebastien Jodogne <s.jodogne@gmail.com> parents: 1733 diff changeset	708 PrintErrorCode(ErrorCode_SQLiteExecute, "SQLite: Cannot execute a command");
e2675b37eb01 Under Windows, the exit status of Orthanc corresponds to the encountered error code Sebastien Jodogne <s.jodogne@gmail.com> parents: 1733 diff changeset	709 PrintErrorCode(ErrorCode_SQLiteRollbackWithoutTransaction, "SQLite: Rolling back a nonexistent transaction (have you called Begin()?)");
e2675b37eb01 Under Windows, the exit status of Orthanc corresponds to the encountered error code Sebastien Jodogne <s.jodogne@gmail.com> parents: 1733 diff changeset	710 PrintErrorCode(ErrorCode_SQLiteCommitWithoutTransaction, "SQLite: Committing a nonexistent transaction");
e2675b37eb01 Under Windows, the exit status of Orthanc corresponds to the encountered error code Sebastien Jodogne <s.jodogne@gmail.com> parents: 1733 diff changeset	711 PrintErrorCode(ErrorCode_SQLiteRegisterFunction, "SQLite: Unable to register a function");
e2675b37eb01 Under Windows, the exit status of Orthanc corresponds to the encountered error code Sebastien Jodogne <s.jodogne@gmail.com> parents: 1733 diff changeset	712 PrintErrorCode(ErrorCode_SQLiteFlush, "SQLite: Unable to flush the database");
e2675b37eb01 Under Windows, the exit status of Orthanc corresponds to the encountered error code Sebastien Jodogne <s.jodogne@gmail.com> parents: 1733 diff changeset	713 PrintErrorCode(ErrorCode_SQLiteCannotRun, "SQLite: Cannot run a cached statement");
e2675b37eb01 Under Windows, the exit status of Orthanc corresponds to the encountered error code Sebastien Jodogne <s.jodogne@gmail.com> parents: 1733 diff changeset	714 PrintErrorCode(ErrorCode_SQLiteCannotStep, "SQLite: Cannot step over a cached statement");
e2675b37eb01 Under Windows, the exit status of Orthanc corresponds to the encountered error code Sebastien Jodogne <s.jodogne@gmail.com> parents: 1733 diff changeset	715 PrintErrorCode(ErrorCode_SQLiteBindOutOfRange, "SQLite: Bing a value while out of range (serious error)");
e2675b37eb01 Under Windows, the exit status of Orthanc corresponds to the encountered error code Sebastien Jodogne <s.jodogne@gmail.com> parents: 1733 diff changeset	716 PrintErrorCode(ErrorCode_SQLitePrepareStatement, "SQLite: Cannot prepare a cached statement");
e2675b37eb01 Under Windows, the exit status of Orthanc corresponds to the encountered error code Sebastien Jodogne <s.jodogne@gmail.com> parents: 1733 diff changeset	717 PrintErrorCode(ErrorCode_SQLiteTransactionAlreadyStarted, "SQLite: Beginning the same transaction twice");
e2675b37eb01 Under Windows, the exit status of Orthanc corresponds to the encountered error code Sebastien Jodogne <s.jodogne@gmail.com> parents: 1733 diff changeset	718 PrintErrorCode(ErrorCode_SQLiteTransactionCommit, "SQLite: Failure when committing the transaction");
e2675b37eb01 Under Windows, the exit status of Orthanc corresponds to the encountered error code Sebastien Jodogne <s.jodogne@gmail.com> parents: 1733 diff changeset	719 PrintErrorCode(ErrorCode_SQLiteTransactionBegin, "SQLite: Cannot start a transaction");
e2675b37eb01 Under Windows, the exit status of Orthanc corresponds to the encountered error code Sebastien Jodogne <s.jodogne@gmail.com> parents: 1733 diff changeset	720 PrintErrorCode(ErrorCode_DirectoryOverFile, "The directory to be created is already occupied by a regular file");
e2675b37eb01 Under Windows, the exit status of Orthanc corresponds to the encountered error code Sebastien Jodogne <s.jodogne@gmail.com> parents: 1733 diff changeset	721 PrintErrorCode(ErrorCode_FileStorageCannotWrite, "Unable to create a subdirectory or a file in the file storage");
e2675b37eb01 Under Windows, the exit status of Orthanc corresponds to the encountered error code Sebastien Jodogne <s.jodogne@gmail.com> parents: 1733 diff changeset	722 PrintErrorCode(ErrorCode_DirectoryExpected, "The specified path does not point to a directory");
1949 d90f737f2dde warn about the use of privileged ports Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	723 PrintErrorCode(ErrorCode_HttpPortInUse, "The TCP port of the HTTP server is privileged or already in use");
d90f737f2dde warn about the use of privileged ports Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	724 PrintErrorCode(ErrorCode_DicomPortInUse, "The TCP port of the DICOM server is privileged or already in use");
1734 e2675b37eb01 Under Windows, the exit status of Orthanc corresponds to the encountered error code Sebastien Jodogne <s.jodogne@gmail.com> parents: 1733 diff changeset	725 PrintErrorCode(ErrorCode_BadHttpStatusInRest, "This HTTP status is not allowed in a REST API");
e2675b37eb01 Under Windows, the exit status of Orthanc corresponds to the encountered error code Sebastien Jodogne <s.jodogne@gmail.com> parents: 1733 diff changeset	726 PrintErrorCode(ErrorCode_RegularFileExpected, "The specified path does not point to a regular file");
e2675b37eb01 Under Windows, the exit status of Orthanc corresponds to the encountered error code Sebastien Jodogne <s.jodogne@gmail.com> parents: 1733 diff changeset	727 PrintErrorCode(ErrorCode_PathToExecutable, "Unable to get the path to the executable");
e2675b37eb01 Under Windows, the exit status of Orthanc corresponds to the encountered error code Sebastien Jodogne <s.jodogne@gmail.com> parents: 1733 diff changeset	728 PrintErrorCode(ErrorCode_MakeDirectory, "Cannot create a directory");
e2675b37eb01 Under Windows, the exit status of Orthanc corresponds to the encountered error code Sebastien Jodogne <s.jodogne@gmail.com> parents: 1733 diff changeset	729 PrintErrorCode(ErrorCode_BadApplicationEntityTitle, "An application entity title (AET) cannot be empty or be longer than 16 characters");
e2675b37eb01 Under Windows, the exit status of Orthanc corresponds to the encountered error code Sebastien Jodogne <s.jodogne@gmail.com> parents: 1733 diff changeset	730 PrintErrorCode(ErrorCode_NoCFindHandler, "No request handler factory for DICOM C-FIND SCP");
e2675b37eb01 Under Windows, the exit status of Orthanc corresponds to the encountered error code Sebastien Jodogne <s.jodogne@gmail.com> parents: 1733 diff changeset	731 PrintErrorCode(ErrorCode_NoCMoveHandler, "No request handler factory for DICOM C-MOVE SCP");
e2675b37eb01 Under Windows, the exit status of Orthanc corresponds to the encountered error code Sebastien Jodogne <s.jodogne@gmail.com> parents: 1733 diff changeset	732 PrintErrorCode(ErrorCode_NoCStoreHandler, "No request handler factory for DICOM C-STORE SCP");
e2675b37eb01 Under Windows, the exit status of Orthanc corresponds to the encountered error code Sebastien Jodogne <s.jodogne@gmail.com> parents: 1733 diff changeset	733 PrintErrorCode(ErrorCode_NoApplicationEntityFilter, "No application entity filter");
e2675b37eb01 Under Windows, the exit status of Orthanc corresponds to the encountered error code Sebastien Jodogne <s.jodogne@gmail.com> parents: 1733 diff changeset	734 PrintErrorCode(ErrorCode_NoSopClassOrInstance, "DicomUserConnection: Unable to find the SOP class and instance");
e2675b37eb01 Under Windows, the exit status of Orthanc corresponds to the encountered error code Sebastien Jodogne <s.jodogne@gmail.com> parents: 1733 diff changeset	735 PrintErrorCode(ErrorCode_NoPresentationContext, "DicomUserConnection: No acceptable presentation context for modality");
e2675b37eb01 Under Windows, the exit status of Orthanc corresponds to the encountered error code Sebastien Jodogne <s.jodogne@gmail.com> parents: 1733 diff changeset	736 PrintErrorCode(ErrorCode_DicomFindUnavailable, "DicomUserConnection: The C-FIND command is not supported by the remote SCP");
e2675b37eb01 Under Windows, the exit status of Orthanc corresponds to the encountered error code Sebastien Jodogne <s.jodogne@gmail.com> parents: 1733 diff changeset	737 PrintErrorCode(ErrorCode_DicomMoveUnavailable, "DicomUserConnection: The C-MOVE command is not supported by the remote SCP");
e2675b37eb01 Under Windows, the exit status of Orthanc corresponds to the encountered error code Sebastien Jodogne <s.jodogne@gmail.com> parents: 1733 diff changeset	738 PrintErrorCode(ErrorCode_CannotStoreInstance, "Cannot store an instance");
e2675b37eb01 Under Windows, the exit status of Orthanc corresponds to the encountered error code Sebastien Jodogne <s.jodogne@gmail.com> parents: 1733 diff changeset	739 PrintErrorCode(ErrorCode_CreateDicomNotString, "Only string values are supported when creating DICOM instances");
e2675b37eb01 Under Windows, the exit status of Orthanc corresponds to the encountered error code Sebastien Jodogne <s.jodogne@gmail.com> parents: 1733 diff changeset	740 PrintErrorCode(ErrorCode_CreateDicomOverrideTag, "Trying to override a value inherited from a parent module");
e2675b37eb01 Under Windows, the exit status of Orthanc corresponds to the encountered error code Sebastien Jodogne <s.jodogne@gmail.com> parents: 1733 diff changeset	741 PrintErrorCode(ErrorCode_CreateDicomUseContent, "Use \"Content\" to inject an image into a new DICOM instance");
e2675b37eb01 Under Windows, the exit status of Orthanc corresponds to the encountered error code Sebastien Jodogne <s.jodogne@gmail.com> parents: 1733 diff changeset	742 PrintErrorCode(ErrorCode_CreateDicomNoPayload, "No payload is present for one instance in the series");
e2675b37eb01 Under Windows, the exit status of Orthanc corresponds to the encountered error code Sebastien Jodogne <s.jodogne@gmail.com> parents: 1733 diff changeset	743 PrintErrorCode(ErrorCode_CreateDicomUseDataUriScheme, "The payload of the DICOM instance must be specified according to Data URI scheme");
e2675b37eb01 Under Windows, the exit status of Orthanc corresponds to the encountered error code Sebastien Jodogne <s.jodogne@gmail.com> parents: 1733 diff changeset	744 PrintErrorCode(ErrorCode_CreateDicomBadParent, "Trying to attach a new DICOM instance to an inexistent resource");
e2675b37eb01 Under Windows, the exit status of Orthanc corresponds to the encountered error code Sebastien Jodogne <s.jodogne@gmail.com> parents: 1733 diff changeset	745 PrintErrorCode(ErrorCode_CreateDicomParentIsInstance, "Trying to attach a new DICOM instance to an instance (must be a series, study or patient)");
e2675b37eb01 Under Windows, the exit status of Orthanc corresponds to the encountered error code Sebastien Jodogne <s.jodogne@gmail.com> parents: 1733 diff changeset	746 PrintErrorCode(ErrorCode_CreateDicomParentEncoding, "Unable to get the encoding of the parent resource");
e2675b37eb01 Under Windows, the exit status of Orthanc corresponds to the encountered error code Sebastien Jodogne <s.jodogne@gmail.com> parents: 1733 diff changeset	747 PrintErrorCode(ErrorCode_UnknownModality, "Unknown modality");
e2675b37eb01 Under Windows, the exit status of Orthanc corresponds to the encountered error code Sebastien Jodogne <s.jodogne@gmail.com> parents: 1733 diff changeset	748 PrintErrorCode(ErrorCode_BadJobOrdering, "Bad ordering of filters in a job");
e2675b37eb01 Under Windows, the exit status of Orthanc corresponds to the encountered error code Sebastien Jodogne <s.jodogne@gmail.com> parents: 1733 diff changeset	749 PrintErrorCode(ErrorCode_JsonToLuaTable, "Cannot convert the given JSON object to a Lua table");
e2675b37eb01 Under Windows, the exit status of Orthanc corresponds to the encountered error code Sebastien Jodogne <s.jodogne@gmail.com> parents: 1733 diff changeset	750 PrintErrorCode(ErrorCode_CannotCreateLua, "Cannot create the Lua context");
e2675b37eb01 Under Windows, the exit status of Orthanc corresponds to the encountered error code Sebastien Jodogne <s.jodogne@gmail.com> parents: 1733 diff changeset	751 PrintErrorCode(ErrorCode_CannotExecuteLua, "Cannot execute a Lua command");
e2675b37eb01 Under Windows, the exit status of Orthanc corresponds to the encountered error code Sebastien Jodogne <s.jodogne@gmail.com> parents: 1733 diff changeset	752 PrintErrorCode(ErrorCode_LuaAlreadyExecuted, "Arguments cannot be pushed after the Lua function is executed");
e2675b37eb01 Under Windows, the exit status of Orthanc corresponds to the encountered error code Sebastien Jodogne <s.jodogne@gmail.com> parents: 1733 diff changeset	753 PrintErrorCode(ErrorCode_LuaBadOutput, "The Lua function does not give the expected number of outputs");
e2675b37eb01 Under Windows, the exit status of Orthanc corresponds to the encountered error code Sebastien Jodogne <s.jodogne@gmail.com> parents: 1733 diff changeset	754 PrintErrorCode(ErrorCode_NotLuaPredicate, "The Lua function is not a predicate (only true/false outputs allowed)");
e2675b37eb01 Under Windows, the exit status of Orthanc corresponds to the encountered error code Sebastien Jodogne <s.jodogne@gmail.com> parents: 1733 diff changeset	755 PrintErrorCode(ErrorCode_LuaReturnsNoString, "The Lua function does not return a string");
e2675b37eb01 Under Windows, the exit status of Orthanc corresponds to the encountered error code Sebastien Jodogne <s.jodogne@gmail.com> parents: 1733 diff changeset	756 PrintErrorCode(ErrorCode_StorageAreaAlreadyRegistered, "Another plugin has already registered a custom storage area");
e2675b37eb01 Under Windows, the exit status of Orthanc corresponds to the encountered error code Sebastien Jodogne <s.jodogne@gmail.com> parents: 1733 diff changeset	757 PrintErrorCode(ErrorCode_DatabaseBackendAlreadyRegistered, "Another plugin has already registered a custom database back-end");
e2675b37eb01 Under Windows, the exit status of Orthanc corresponds to the encountered error code Sebastien Jodogne <s.jodogne@gmail.com> parents: 1733 diff changeset	758 PrintErrorCode(ErrorCode_DatabaseNotInitialized, "Plugin trying to call the database during its initialization");
e2675b37eb01 Under Windows, the exit status of Orthanc corresponds to the encountered error code Sebastien Jodogne <s.jodogne@gmail.com> parents: 1733 diff changeset	759 PrintErrorCode(ErrorCode_SslDisabled, "Orthanc has been built without SSL support");
e2675b37eb01 Under Windows, the exit status of Orthanc corresponds to the encountered error code Sebastien Jodogne <s.jodogne@gmail.com> parents: 1733 diff changeset	760 PrintErrorCode(ErrorCode_CannotOrderSlices, "Unable to order the slices of the series");
1786 164d78911382 primitives to handle dicom worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1781 diff changeset	761 PrintErrorCode(ErrorCode_NoWorklistHandler, "No request handler factory for DICOM C-Find Modality SCP");
1980 ebce5f456b8e new error code: ErrorCode_AlreadyExistingTag Sebastien Jodogne <s.jodogne@gmail.com> parents: 1965 diff changeset	762 PrintErrorCode(ErrorCode_AlreadyExistingTag, "Cannot override the value of a tag that already exists");
3604 e327b44780bb abstraction: storage commitment handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 3537 diff changeset	763 PrintErrorCode(ErrorCode_NoStorageCommitmentHandler, "No request handler factory for DICOM N-ACTION SCP (storage commitment)");
3404 e280ced38a4c ErrorCode_UnsupportedMediaType Sebastien Jodogne <s.jodogne@gmail.com> parents: 3376 diff changeset	764 PrintErrorCode(ErrorCode_UnsupportedMediaType, "Unsupported media type");
1733 e1f5ab395297 PrintErrors Sebastien Jodogne <s.jodogne@gmail.com> parents: 1730 diff changeset	765 }
e1f5ab395297 PrintErrors Sebastien Jodogne <s.jodogne@gmail.com> parents: 1730 diff changeset	766
e1f5ab395297 PrintErrors Sebastien Jodogne <s.jodogne@gmail.com> parents: 1730 diff changeset	767 std::cout << std::endl;
e1f5ab395297 PrintErrors Sebastien Jodogne <s.jodogne@gmail.com> parents: 1730 diff changeset	768 }
e1f5ab395297 PrintErrors Sebastien Jodogne <s.jodogne@gmail.com> parents: 1730 diff changeset	769
e1f5ab395297 PrintErrors Sebastien Jodogne <s.jodogne@gmail.com> parents: 1730 diff changeset	770
893 f57802f8b4dc plugins for windows Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	771
2136 dd609a99d39a uniformization of the macro naming Sebastien Jodogne <s.jodogne@gmail.com> parents: 2133 diff changeset	772 #if ORTHANC_ENABLE_PLUGINS == 1
1434 f9cd40166269 refactoring of OrthancPlugins, improvement in ServeFolders Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	773 static void LoadPlugins(OrthancPlugins& plugins)
893 f57802f8b4dc plugins for windows Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	774 {
1434 f9cd40166269 refactoring of OrthancPlugins, improvement in ServeFolders Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	775 std::list<std::string> path;
2940 4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2903 diff changeset	776
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2903 diff changeset	777 {
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2903 diff changeset	778 OrthancConfiguration::ReaderLock lock;
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2903 diff changeset	779 lock.GetConfiguration().GetListOfStringsParameter(path, "Plugins");
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2903 diff changeset	780 }
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2903 diff changeset	781
893 f57802f8b4dc plugins for windows Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	782 for (std::list<std::string>::const_iterator
1434 f9cd40166269 refactoring of OrthancPlugins, improvement in ServeFolders Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	783 it = path.begin(); it != path.end(); ++it)
893 f57802f8b4dc plugins for windows Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	784 {
2940 4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2903 diff changeset	785 std::string path;
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2903 diff changeset	786
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2903 diff changeset	787 {
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2903 diff changeset	788 OrthancConfiguration::ReaderLock lock;
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2903 diff changeset	789 path = lock.GetConfiguration().InterpretStringParameterAsPath(*it);
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2903 diff changeset	790 }
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2903 diff changeset	791
1321 0f9e0e808e0f more explicit message Sebastien Jodogne <s.jodogne@gmail.com> parents: 1310 diff changeset	792 LOG(WARNING) << "Loading plugin(s) from: " << path;
1434 f9cd40166269 refactoring of OrthancPlugins, improvement in ServeFolders Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	793 plugins.GetManager().RegisterPlugin(path);
893 f57802f8b4dc plugins for windows Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	794 }
f57802f8b4dc plugins for windows Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	795 }
1632 eb8fbcf008b5 fix build with plugins disabled Sebastien Jodogne <s.jodogne@gmail.com> parents: 1630 diff changeset	796 #endif
893 f57802f8b4dc plugins for windows Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	797
f57802f8b4dc plugins for windows Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	798
f57802f8b4dc plugins for windows Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	799
1452 b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	800 // Returns "true" if restart is required
b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	801 static bool WaitForExit(ServerContext& context,
b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	802 OrthancRestApi& restApi)
b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	803 {
b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	804 LOG(WARNING) << "Orthanc has started";
b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	805
2136 dd609a99d39a uniformization of the macro naming Sebastien Jodogne <s.jodogne@gmail.com> parents: 2133 diff changeset	806 #if ORTHANC_ENABLE_PLUGINS == 1
1741 06addfcd1d4c OrthancStarted and OrthancStopped events in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1734 diff changeset	807 if (context.HasPlugins())
06addfcd1d4c OrthancStarted and OrthancStopped events in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1734 diff changeset	808 {
06addfcd1d4c OrthancStarted and OrthancStopped events in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1734 diff changeset	809 context.GetPlugins().SignalOrthancStarted();
06addfcd1d4c OrthancStarted and OrthancStopped events in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1734 diff changeset	810 }
06addfcd1d4c OrthancStarted and OrthancStopped events in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1734 diff changeset	811 #endif
06addfcd1d4c OrthancStarted and OrthancStopped events in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1734 diff changeset	812
2617 912a767911b0 back to a single Lua context Sebastien Jodogne <s.jodogne@gmail.com> parents: 2616 diff changeset	813 context.GetLuaScripting().Start();
912a767911b0 back to a single Lua context Sebastien Jodogne <s.jodogne@gmail.com> parents: 2616 diff changeset	814 context.GetLuaScripting().Execute("Initialize");
1455 a68545767975 Initialize() and Finalize() events in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1452 diff changeset	815
2010 4dafe2a0d3ab Support of SIGHUP signal (restart Orthanc only if the configuration files have changed) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2009 diff changeset	816 bool restart;
4dafe2a0d3ab Support of SIGHUP signal (restart Orthanc only if the configuration files have changed) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2009 diff changeset	817
4dafe2a0d3ab Support of SIGHUP signal (restart Orthanc only if the configuration files have changed) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2009 diff changeset	818 for (;;)
4dafe2a0d3ab Support of SIGHUP signal (restart Orthanc only if the configuration files have changed) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2009 diff changeset	819 {
2140 aa4b8895cd23 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2136 diff changeset	820 ServerBarrierEvent event = SystemToolbox::ServerBarrier(restApi.LeaveBarrierFlag());
2010 4dafe2a0d3ab Support of SIGHUP signal (restart Orthanc only if the configuration files have changed) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2009 diff changeset	821 restart = restApi.IsResetRequestReceived();
1452 b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	822
2010 4dafe2a0d3ab Support of SIGHUP signal (restart Orthanc only if the configuration files have changed) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2009 diff changeset	823 if (!restart &&
4dafe2a0d3ab Support of SIGHUP signal (restart Orthanc only if the configuration files have changed) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2009 diff changeset	824 event == ServerBarrierEvent_Reload)
4dafe2a0d3ab Support of SIGHUP signal (restart Orthanc only if the configuration files have changed) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2009 diff changeset	825 {
2015 bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2010 diff changeset	826 // Handling of SIGHUP
bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2010 diff changeset	827
2940 4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2903 diff changeset	828 OrthancConfiguration::ReaderLock lock;
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2903 diff changeset	829 if (lock.GetConfiguration().HasConfigurationChanged())
2010 4dafe2a0d3ab Support of SIGHUP signal (restart Orthanc only if the configuration files have changed) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2009 diff changeset	830 {
4dafe2a0d3ab Support of SIGHUP signal (restart Orthanc only if the configuration files have changed) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2009 diff changeset	831 LOG(WARNING) << "A SIGHUP signal has been received, resetting Orthanc";
2015 bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2010 diff changeset	832 Logging::Flush();
2010 4dafe2a0d3ab Support of SIGHUP signal (restart Orthanc only if the configuration files have changed) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2009 diff changeset	833 restart = true;
4dafe2a0d3ab Support of SIGHUP signal (restart Orthanc only if the configuration files have changed) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2009 diff changeset	834 break;
4dafe2a0d3ab Support of SIGHUP signal (restart Orthanc only if the configuration files have changed) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2009 diff changeset	835 }
4dafe2a0d3ab Support of SIGHUP signal (restart Orthanc only if the configuration files have changed) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2009 diff changeset	836 else
4dafe2a0d3ab Support of SIGHUP signal (restart Orthanc only if the configuration files have changed) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2009 diff changeset	837 {
2946 2e751f615e03 new configuration options: DicomModalitiesInDatabase and OrthancPeersInDatabase Sebastien Jodogne <s.jodogne@gmail.com> parents: 2941 diff changeset	838 LOG(WARNING) << "A SIGHUP signal has been received, but is ignored "
2e751f615e03 new configuration options: DicomModalitiesInDatabase and OrthancPeersInDatabase Sebastien Jodogne <s.jodogne@gmail.com> parents: 2941 diff changeset	839 << "as the configuration has not changed on the disk";
2015 bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2010 diff changeset	840 Logging::Flush();
2010 4dafe2a0d3ab Support of SIGHUP signal (restart Orthanc only if the configuration files have changed) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2009 diff changeset	841 continue;
4dafe2a0d3ab Support of SIGHUP signal (restart Orthanc only if the configuration files have changed) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2009 diff changeset	842 }
4dafe2a0d3ab Support of SIGHUP signal (restart Orthanc only if the configuration files have changed) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2009 diff changeset	843 }
4dafe2a0d3ab Support of SIGHUP signal (restart Orthanc only if the configuration files have changed) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2009 diff changeset	844 else
4dafe2a0d3ab Support of SIGHUP signal (restart Orthanc only if the configuration files have changed) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2009 diff changeset	845 {
4dafe2a0d3ab Support of SIGHUP signal (restart Orthanc only if the configuration files have changed) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2009 diff changeset	846 break;
4dafe2a0d3ab Support of SIGHUP signal (restart Orthanc only if the configuration files have changed) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2009 diff changeset	847 }
2009 e2dd40abce72 catching SIGHUP signal Sebastien Jodogne <s.jodogne@gmail.com> parents: 2000 diff changeset	848 }
e2dd40abce72 catching SIGHUP signal Sebastien Jodogne <s.jodogne@gmail.com> parents: 2000 diff changeset	849
2617 912a767911b0 back to a single Lua context Sebastien Jodogne <s.jodogne@gmail.com> parents: 2616 diff changeset	850 context.GetLuaScripting().Execute("Finalize");
912a767911b0 back to a single Lua context Sebastien Jodogne <s.jodogne@gmail.com> parents: 2616 diff changeset	851 context.GetLuaScripting().Stop();
1455 a68545767975 Initialize() and Finalize() events in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1452 diff changeset	852
2136 dd609a99d39a uniformization of the macro naming Sebastien Jodogne <s.jodogne@gmail.com> parents: 2133 diff changeset	853 #if ORTHANC_ENABLE_PLUGINS == 1
1741 06addfcd1d4c OrthancStarted and OrthancStopped events in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1734 diff changeset	854 if (context.HasPlugins())
06addfcd1d4c OrthancStarted and OrthancStopped events in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1734 diff changeset	855 {
06addfcd1d4c OrthancStarted and OrthancStopped events in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1734 diff changeset	856 context.GetPlugins().SignalOrthancStopped();
06addfcd1d4c OrthancStarted and OrthancStopped events in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1734 diff changeset	857 }
06addfcd1d4c OrthancStarted and OrthancStopped events in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1734 diff changeset	858 #endif
06addfcd1d4c OrthancStarted and OrthancStopped events in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1734 diff changeset	859
1452 b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	860 if (restart)
b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	861 {
b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	862 LOG(WARNING) << "Reset request received, restarting Orthanc";
b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	863 }
b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	864
b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	865 // We're done
b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	866 LOG(WARNING) << "Orthanc is stopping";
b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	867
b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	868 return restart;
b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	869 }
b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	870
1368 b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1366 diff changeset	871
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1366 diff changeset	872
1452 b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	873 static bool StartHttpServer(ServerContext& context,
1645 1558b3226b18 IHttpExceptionFormatter Sebastien Jodogne <s.jodogne@gmail.com> parents: 1632 diff changeset	874 OrthancRestApi& restApi,
1558b3226b18 IHttpExceptionFormatter Sebastien Jodogne <s.jodogne@gmail.com> parents: 1632 diff changeset	875 OrthancPlugins* plugins)
1103 bec1eccf976c Hot restart of Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 1102 diff changeset	876 {
2940 4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2903 diff changeset	877 bool httpServerEnabled;
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2903 diff changeset	878
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2903 diff changeset	879 {
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2903 diff changeset	880 OrthancConfiguration::ReaderLock lock;
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2903 diff changeset	881 httpServerEnabled = lock.GetConfiguration().GetBooleanParameter("HttpServerEnabled", true);
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2903 diff changeset	882 }
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2903 diff changeset	883
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2903 diff changeset	884 if (!httpServerEnabled)
1452 b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	885 {
b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	886 LOG(WARNING) << "The HTTP server is disabled";
b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	887 return WaitForExit(context, restApi);
b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	888 }
1310 61ce8147f30d custom database back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1289 diff changeset	889 else
61ce8147f30d custom database back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1289 diff changeset	890 {
2940 4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2903 diff changeset	891 MyIncomingHttpRequestFilter httpFilter(context, plugins);
3138 ab46e537f92e renamed class MongooseServer as HttpServer, CivetWeb made default HTTP server Sebastien Jodogne <s.jodogne@gmail.com> parents: 3137 diff changeset	892 HttpServer httpServer;
2940 4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2903 diff changeset	893 bool httpDescribeErrors;
1103 bec1eccf976c Hot restart of Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 1102 diff changeset	894
3137 5a3b961e9524 New configuration option: 'TcpNoDelay' to disable Nagle's algorithm in HTTP server Sebastien Jodogne <s.jodogne@gmail.com> parents: 3135 diff changeset	895 #if ORTHANC_ENABLE_MONGOOSE == 1
5a3b961e9524 New configuration option: 'TcpNoDelay' to disable Nagle's algorithm in HTTP server Sebastien Jodogne <s.jodogne@gmail.com> parents: 3135 diff changeset	896 const bool defaultKeepAlive = false;
5a3b961e9524 New configuration option: 'TcpNoDelay' to disable Nagle's algorithm in HTTP server Sebastien Jodogne <s.jodogne@gmail.com> parents: 3135 diff changeset	897 #elif ORTHANC_ENABLE_CIVETWEB == 1
5a3b961e9524 New configuration option: 'TcpNoDelay' to disable Nagle's algorithm in HTTP server Sebastien Jodogne <s.jodogne@gmail.com> parents: 3135 diff changeset	898 const bool defaultKeepAlive = true;
5a3b961e9524 New configuration option: 'TcpNoDelay' to disable Nagle's algorithm in HTTP server Sebastien Jodogne <s.jodogne@gmail.com> parents: 3135 diff changeset	899 #else
5a3b961e9524 New configuration option: 'TcpNoDelay' to disable Nagle's algorithm in HTTP server Sebastien Jodogne <s.jodogne@gmail.com> parents: 3135 diff changeset	900 # error "Either Mongoose or Civetweb must be enabled to compile this file"
5a3b961e9524 New configuration option: 'TcpNoDelay' to disable Nagle's algorithm in HTTP server Sebastien Jodogne <s.jodogne@gmail.com> parents: 3135 diff changeset	901 #endif
5a3b961e9524 New configuration option: 'TcpNoDelay' to disable Nagle's algorithm in HTTP server Sebastien Jodogne <s.jodogne@gmail.com> parents: 3135 diff changeset	902
2940 4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2903 diff changeset	903 {
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2903 diff changeset	904 OrthancConfiguration::ReaderLock lock;
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2903 diff changeset	905
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2903 diff changeset	906 httpDescribeErrors = lock.GetConfiguration().GetBooleanParameter("HttpDescribeErrors", true);
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2903 diff changeset	907
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2903 diff changeset	908 // HTTP server
3180 07a2f637b76d new option: "HttpThreadsCount" to set the number of threads in the embedded HTTP server Sebastien Jodogne <s.jodogne@gmail.com> parents: 3164 diff changeset	909 httpServer.SetThreadsCount(lock.GetConfiguration().GetUnsignedIntegerParameter("HttpThreadsCount", 50));
2940 4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2903 diff changeset	910 httpServer.SetPortNumber(lock.GetConfiguration().GetUnsignedIntegerParameter("HttpPort", 8042));
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2903 diff changeset	911 httpServer.SetRemoteAccessAllowed(lock.GetConfiguration().GetBooleanParameter("RemoteAccessAllowed", false));
3137 5a3b961e9524 New configuration option: 'TcpNoDelay' to disable Nagle's algorithm in HTTP server Sebastien Jodogne <s.jodogne@gmail.com> parents: 3135 diff changeset	912 httpServer.SetKeepAliveEnabled(lock.GetConfiguration().GetBooleanParameter("KeepAlive", defaultKeepAlive));
2940 4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2903 diff changeset	913 httpServer.SetHttpCompressionEnabled(lock.GetConfiguration().GetBooleanParameter("HttpCompressionEnabled", true));
3137 5a3b961e9524 New configuration option: 'TcpNoDelay' to disable Nagle's algorithm in HTTP server Sebastien Jodogne <s.jodogne@gmail.com> parents: 3135 diff changeset	914 httpServer.SetTcpNoDelay(lock.GetConfiguration().GetBooleanParameter("TcpNoDelay", true));
3537 9cc09f4c0fa9 New configuration option: "HttpRequestTimeout" Sebastien Jodogne <s.jodogne@gmail.com> parents: 3535 diff changeset	915 httpServer.SetRequestTimeout(lock.GetConfiguration().GetUnsignedIntegerParameter("HttpRequestTimeout", 30));
2940 4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2903 diff changeset	916
3534 cac8ffcb9cef forcing AuthenticationEnabled to false is considered as insecure if remote access is allowed Sebastien Jodogne <s.jodogne@gmail.com> parents: 3533 diff changeset	917 // Let's assume that the HTTP server is secure
cac8ffcb9cef forcing AuthenticationEnabled to false is considered as insecure if remote access is allowed Sebastien Jodogne <s.jodogne@gmail.com> parents: 3533 diff changeset	918 context.SetHttpServerSecure(true);
cac8ffcb9cef forcing AuthenticationEnabled to false is considered as insecure if remote access is allowed Sebastien Jodogne <s.jodogne@gmail.com> parents: 3533 diff changeset	919
3506 d2b9981017c4 better handling of HTTP security Sebastien Jodogne <s.jodogne@gmail.com> parents: 3501 diff changeset	920 bool authenticationEnabled;
d2b9981017c4 better handling of HTTP security Sebastien Jodogne <s.jodogne@gmail.com> parents: 3501 diff changeset	921 if (lock.GetConfiguration().LookupBooleanParameter(authenticationEnabled, "AuthenticationEnabled"))
3500 0d248cc63ded Security: If remote HTTP access is enabled, HTTP authentication automatically gets enabled Sebastien Jodogne <s.jodogne@gmail.com> parents: 3495 diff changeset	922 {
3506 d2b9981017c4 better handling of HTTP security Sebastien Jodogne <s.jodogne@gmail.com> parents: 3501 diff changeset	923 httpServer.SetAuthenticationEnabled(authenticationEnabled);
d2b9981017c4 better handling of HTTP security Sebastien Jodogne <s.jodogne@gmail.com> parents: 3501 diff changeset	924
d2b9981017c4 better handling of HTTP security Sebastien Jodogne <s.jodogne@gmail.com> parents: 3501 diff changeset	925 if (httpServer.IsRemoteAccessAllowed() &&
d2b9981017c4 better handling of HTTP security Sebastien Jodogne <s.jodogne@gmail.com> parents: 3501 diff changeset	926 !authenticationEnabled)
3501 27b53c61aa99 warning when authentication is automatically enabled Sebastien Jodogne <s.jodogne@gmail.com> parents: 3500 diff changeset	927 {
3533 2090ec6a83a5 create a default user if none is provided, while issuing a warning in Orthanc Explorer Sebastien Jodogne <s.jodogne@gmail.com> parents: 3526 diff changeset	928 LOG(WARNING) << "====> Remote access is enabled while user authentication is explicitly disabled, "
3534 cac8ffcb9cef forcing AuthenticationEnabled to false is considered as insecure if remote access is allowed Sebastien Jodogne <s.jodogne@gmail.com> parents: 3533 diff changeset	929 << "your setup is POSSIBLY INSECURE <====";
cac8ffcb9cef forcing AuthenticationEnabled to false is considered as insecure if remote access is allowed Sebastien Jodogne <s.jodogne@gmail.com> parents: 3533 diff changeset	930 context.SetHttpServerSecure(false);
3501 27b53c61aa99 warning when authentication is automatically enabled Sebastien Jodogne <s.jodogne@gmail.com> parents: 3500 diff changeset	931 }
3506 d2b9981017c4 better handling of HTTP security Sebastien Jodogne <s.jodogne@gmail.com> parents: 3501 diff changeset	932 }
d2b9981017c4 better handling of HTTP security Sebastien Jodogne <s.jodogne@gmail.com> parents: 3501 diff changeset	933 else if (httpServer.IsRemoteAccessAllowed())
d2b9981017c4 better handling of HTTP security Sebastien Jodogne <s.jodogne@gmail.com> parents: 3501 diff changeset	934 {
d2b9981017c4 better handling of HTTP security Sebastien Jodogne <s.jodogne@gmail.com> parents: 3501 diff changeset	935 // Starting with Orthanc 1.5.8, it is impossible to enable
d2b9981017c4 better handling of HTTP security Sebastien Jodogne <s.jodogne@gmail.com> parents: 3501 diff changeset	936 // remote access without having explicitly disabled user
d2b9981017c4 better handling of HTTP security Sebastien Jodogne <s.jodogne@gmail.com> parents: 3501 diff changeset	937 // authentication.
d2b9981017c4 better handling of HTTP security Sebastien Jodogne <s.jodogne@gmail.com> parents: 3501 diff changeset	938 LOG(WARNING) << "Remote access is allowed but \"AuthenticationEnabled\" is not in the configuration, "
d2b9981017c4 better handling of HTTP security Sebastien Jodogne <s.jodogne@gmail.com> parents: 3501 diff changeset	939 << "automatically enabling HTTP authentication for security";
3500 0d248cc63ded Security: If remote HTTP access is enabled, HTTP authentication automatically gets enabled Sebastien Jodogne <s.jodogne@gmail.com> parents: 3495 diff changeset	940 httpServer.SetAuthenticationEnabled(true);
0d248cc63ded Security: If remote HTTP access is enabled, HTTP authentication automatically gets enabled Sebastien Jodogne <s.jodogne@gmail.com> parents: 3495 diff changeset	941 }
0d248cc63ded Security: If remote HTTP access is enabled, HTTP authentication automatically gets enabled Sebastien Jodogne <s.jodogne@gmail.com> parents: 3495 diff changeset	942 else
0d248cc63ded Security: If remote HTTP access is enabled, HTTP authentication automatically gets enabled Sebastien Jodogne <s.jodogne@gmail.com> parents: 3495 diff changeset	943 {
3506 d2b9981017c4 better handling of HTTP security Sebastien Jodogne <s.jodogne@gmail.com> parents: 3501 diff changeset	944 // If Orthanc only listens on the localhost, it is OK to have
d2b9981017c4 better handling of HTTP security Sebastien Jodogne <s.jodogne@gmail.com> parents: 3501 diff changeset	945 // "AuthenticationEnabled" disabled
d2b9981017c4 better handling of HTTP security Sebastien Jodogne <s.jodogne@gmail.com> parents: 3501 diff changeset	946 httpServer.SetAuthenticationEnabled(false);
3500 0d248cc63ded Security: If remote HTTP access is enabled, HTTP authentication automatically gets enabled Sebastien Jodogne <s.jodogne@gmail.com> parents: 3495 diff changeset	947 }
1310 61ce8147f30d custom database back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1289 diff changeset	948
3500 0d248cc63ded Security: If remote HTTP access is enabled, HTTP authentication automatically gets enabled Sebastien Jodogne <s.jodogne@gmail.com> parents: 3495 diff changeset	949 bool hasUsers = lock.GetConfiguration().SetupRegisteredUsers(httpServer);
0d248cc63ded Security: If remote HTTP access is enabled, HTTP authentication automatically gets enabled Sebastien Jodogne <s.jodogne@gmail.com> parents: 3495 diff changeset	950
0d248cc63ded Security: If remote HTTP access is enabled, HTTP authentication automatically gets enabled Sebastien Jodogne <s.jodogne@gmail.com> parents: 3495 diff changeset	951 if (httpServer.IsAuthenticationEnabled() &&
0d248cc63ded Security: If remote HTTP access is enabled, HTTP authentication automatically gets enabled Sebastien Jodogne <s.jodogne@gmail.com> parents: 3495 diff changeset	952 !hasUsers)
0d248cc63ded Security: If remote HTTP access is enabled, HTTP authentication automatically gets enabled Sebastien Jodogne <s.jodogne@gmail.com> parents: 3495 diff changeset	953 {
3533 2090ec6a83a5 create a default user if none is provided, while issuing a warning in Orthanc Explorer Sebastien Jodogne <s.jodogne@gmail.com> parents: 3526 diff changeset	954 if (httpServer.IsRemoteAccessAllowed())
2090ec6a83a5 create a default user if none is provided, while issuing a warning in Orthanc Explorer Sebastien Jodogne <s.jodogne@gmail.com> parents: 3526 diff changeset	955 {
2090ec6a83a5 create a default user if none is provided, while issuing a warning in Orthanc Explorer Sebastien Jodogne <s.jodogne@gmail.com> parents: 3526 diff changeset	956 /**
2090ec6a83a5 create a default user if none is provided, while issuing a warning in Orthanc Explorer Sebastien Jodogne <s.jodogne@gmail.com> parents: 3526 diff changeset	957 * Starting with Orthanc 1.5.8, if no user is explicitly
2090ec6a83a5 create a default user if none is provided, while issuing a warning in Orthanc Explorer Sebastien Jodogne <s.jodogne@gmail.com> parents: 3526 diff changeset	958 * defined while remote access is allowed, we create a
2090ec6a83a5 create a default user if none is provided, while issuing a warning in Orthanc Explorer Sebastien Jodogne <s.jodogne@gmail.com> parents: 3526 diff changeset	959 * default user, and Orthanc Explorer shows a warning
2090ec6a83a5 create a default user if none is provided, while issuing a warning in Orthanc Explorer Sebastien Jodogne <s.jodogne@gmail.com> parents: 3526 diff changeset	960 * message about an "Insecure setup". This convention is
2090ec6a83a5 create a default user if none is provided, while issuing a warning in Orthanc Explorer Sebastien Jodogne <s.jodogne@gmail.com> parents: 3526 diff changeset	961 * used in Docker images "jodogne/orthanc",
2090ec6a83a5 create a default user if none is provided, while issuing a warning in Orthanc Explorer Sebastien Jodogne <s.jodogne@gmail.com> parents: 3526 diff changeset	962 * "jodogne/orthanc-plugins" and "osimis/orthanc".
2090ec6a83a5 create a default user if none is provided, while issuing a warning in Orthanc Explorer Sebastien Jodogne <s.jodogne@gmail.com> parents: 3526 diff changeset	963 **/
3534 cac8ffcb9cef forcing AuthenticationEnabled to false is considered as insecure if remote access is allowed Sebastien Jodogne <s.jodogne@gmail.com> parents: 3533 diff changeset	964 LOG(WARNING) << "====> HTTP authentication is enabled, but no user is declared. "
cac8ffcb9cef forcing AuthenticationEnabled to false is considered as insecure if remote access is allowed Sebastien Jodogne <s.jodogne@gmail.com> parents: 3533 diff changeset	965 << "Creating a default user: Review your configuration option \"RegisteredUsers\". "
cac8ffcb9cef forcing AuthenticationEnabled to false is considered as insecure if remote access is allowed Sebastien Jodogne <s.jodogne@gmail.com> parents: 3533 diff changeset	966 << "Your setup is INSECURE <====";
3533 2090ec6a83a5 create a default user if none is provided, while issuing a warning in Orthanc Explorer Sebastien Jodogne <s.jodogne@gmail.com> parents: 3526 diff changeset	967
3534 cac8ffcb9cef forcing AuthenticationEnabled to false is considered as insecure if remote access is allowed Sebastien Jodogne <s.jodogne@gmail.com> parents: 3533 diff changeset	968 context.SetHttpServerSecure(false);
3533 2090ec6a83a5 create a default user if none is provided, while issuing a warning in Orthanc Explorer Sebastien Jodogne <s.jodogne@gmail.com> parents: 3526 diff changeset	969
2090ec6a83a5 create a default user if none is provided, while issuing a warning in Orthanc Explorer Sebastien Jodogne <s.jodogne@gmail.com> parents: 3526 diff changeset	970 // This is the username/password of the default user in Orthanc.
2090ec6a83a5 create a default user if none is provided, while issuing a warning in Orthanc Explorer Sebastien Jodogne <s.jodogne@gmail.com> parents: 3526 diff changeset	971 httpServer.RegisterUser("orthanc", "orthanc");
2090ec6a83a5 create a default user if none is provided, while issuing a warning in Orthanc Explorer Sebastien Jodogne <s.jodogne@gmail.com> parents: 3526 diff changeset	972 }
2090ec6a83a5 create a default user if none is provided, while issuing a warning in Orthanc Explorer Sebastien Jodogne <s.jodogne@gmail.com> parents: 3526 diff changeset	973 else
2090ec6a83a5 create a default user if none is provided, while issuing a warning in Orthanc Explorer Sebastien Jodogne <s.jodogne@gmail.com> parents: 3526 diff changeset	974 {
2090ec6a83a5 create a default user if none is provided, while issuing a warning in Orthanc Explorer Sebastien Jodogne <s.jodogne@gmail.com> parents: 3526 diff changeset	975 LOG(WARNING) << "HTTP authentication is enabled, but no user is declared, "
2090ec6a83a5 create a default user if none is provided, while issuing a warning in Orthanc Explorer Sebastien Jodogne <s.jodogne@gmail.com> parents: 3526 diff changeset	976 << "check the value of configuration option \"RegisteredUsers\"";
2090ec6a83a5 create a default user if none is provided, while issuing a warning in Orthanc Explorer Sebastien Jodogne <s.jodogne@gmail.com> parents: 3526 diff changeset	977 }
2090ec6a83a5 create a default user if none is provided, while issuing a warning in Orthanc Explorer Sebastien Jodogne <s.jodogne@gmail.com> parents: 3526 diff changeset	978 }
3500 0d248cc63ded Security: If remote HTTP access is enabled, HTTP authentication automatically gets enabled Sebastien Jodogne <s.jodogne@gmail.com> parents: 3495 diff changeset	979
2940 4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2903 diff changeset	980 if (lock.GetConfiguration().GetBooleanParameter("SslEnabled", false))
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2903 diff changeset	981 {
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2903 diff changeset	982 std::string certificate = lock.GetConfiguration().InterpretStringParameterAsPath(
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2903 diff changeset	983 lock.GetConfiguration().GetStringParameter("SslCertificate", "certificate.pem"));
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2903 diff changeset	984 httpServer.SetSslEnabled(true);
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2903 diff changeset	985 httpServer.SetSslCertificate(certificate.c_str());
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2903 diff changeset	986 }
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2903 diff changeset	987 else
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2903 diff changeset	988 {
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2903 diff changeset	989 httpServer.SetSslEnabled(false);
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2903 diff changeset	990 }
3535 41365091a41e display a security warning in the logs at startup when ExecuteLuaEnabled is true Alain Mazy <alain@mazy.be> parents: 3534 diff changeset	991
41365091a41e display a security warning in the logs at startup when ExecuteLuaEnabled is true Alain Mazy <alain@mazy.be> parents: 3534 diff changeset	992 if (lock.GetConfiguration().GetBooleanParameter("ExecuteLuaEnabled", false))
41365091a41e display a security warning in the logs at startup when ExecuteLuaEnabled is true Alain Mazy <alain@mazy.be> parents: 3534 diff changeset	993 {
41365091a41e display a security warning in the logs at startup when ExecuteLuaEnabled is true Alain Mazy <alain@mazy.be> parents: 3534 diff changeset	994 context.SetExecuteLuaEnabled(true);
41365091a41e display a security warning in the logs at startup when ExecuteLuaEnabled is true Alain Mazy <alain@mazy.be> parents: 3534 diff changeset	995 LOG(WARNING) << "====> Remote LUA script execution is enabled. Review your configuration option \"ExecuteLuaEnabled\". "
41365091a41e display a security warning in the logs at startup when ExecuteLuaEnabled is true Alain Mazy <alain@mazy.be> parents: 3534 diff changeset	996 << "Your setup is POSSIBLY INSECURE <====";
41365091a41e display a security warning in the logs at startup when ExecuteLuaEnabled is true Alain Mazy <alain@mazy.be> parents: 3534 diff changeset	997 }
41365091a41e display a security warning in the logs at startup when ExecuteLuaEnabled is true Alain Mazy <alain@mazy.be> parents: 3534 diff changeset	998 else
41365091a41e display a security warning in the logs at startup when ExecuteLuaEnabled is true Alain Mazy <alain@mazy.be> parents: 3534 diff changeset	999 {
41365091a41e display a security warning in the logs at startup when ExecuteLuaEnabled is true Alain Mazy <alain@mazy.be> parents: 3534 diff changeset	1000 context.SetExecuteLuaEnabled(false);
41365091a41e display a security warning in the logs at startup when ExecuteLuaEnabled is true Alain Mazy <alain@mazy.be> parents: 3534 diff changeset	1001 LOG(WARNING) << "Remote LUA script execution is disabled";
41365091a41e display a security warning in the logs at startup when ExecuteLuaEnabled is true Alain Mazy <alain@mazy.be> parents: 3534 diff changeset	1002 }
2940 4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2903 diff changeset	1003 }
1949 d90f737f2dde warn about the use of privileged ports Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	1004
2940 4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2903 diff changeset	1005 MyHttpExceptionFormatter exceptionFormatter(httpDescribeErrors, plugins);
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2903 diff changeset	1006
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2903 diff changeset	1007 httpServer.SetIncomingHttpRequestFilter(httpFilter);
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2903 diff changeset	1008 httpServer.SetHttpExceptionFormatter(exceptionFormatter);
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2903 diff changeset	1009 httpServer.Register(context.GetHttpHandler());
1452 b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	1010
2940 4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2903 diff changeset	1011 if (httpServer.GetPortNumber() < 1024)
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2903 diff changeset	1012 {
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2903 diff changeset	1013 LOG(WARNING) << "The HTTP port is privileged ("
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2903 diff changeset	1014 << httpServer.GetPortNumber() << " is below 1024), "
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2903 diff changeset	1015 << "make sure you run Orthanc as root/administrator";
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2903 diff changeset	1016 }
1103 bec1eccf976c Hot restart of Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 1102 diff changeset	1017
2940 4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2903 diff changeset	1018 httpServer.Start();
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2903 diff changeset	1019
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2903 diff changeset	1020 bool restart = WaitForExit(context, restApi);
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2903 diff changeset	1021
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2903 diff changeset	1022 httpServer.Stop();
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2903 diff changeset	1023 LOG(WARNING) << " HTTP server has stopped";
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2903 diff changeset	1024
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2903 diff changeset	1025 return restart;
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2903 diff changeset	1026 }
1452 b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	1027 }
b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	1028
b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	1029
b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	1030 static bool StartDicomServer(ServerContext& context,
1645 1558b3226b18 IHttpExceptionFormatter Sebastien Jodogne <s.jodogne@gmail.com> parents: 1632 diff changeset	1031 OrthancRestApi& restApi,
1558b3226b18 IHttpExceptionFormatter Sebastien Jodogne <s.jodogne@gmail.com> parents: 1632 diff changeset	1032 OrthancPlugins* plugins)
1452 b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	1033 {
2940 4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2903 diff changeset	1034 bool dicomServerEnabled;
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2903 diff changeset	1035
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2903 diff changeset	1036 {
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2903 diff changeset	1037 OrthancConfiguration::ReaderLock lock;
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2903 diff changeset	1038 dicomServerEnabled = lock.GetConfiguration().GetBooleanParameter("DicomServerEnabled", true);
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2903 diff changeset	1039 }
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2903 diff changeset	1040
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2903 diff changeset	1041 if (!dicomServerEnabled)
1103 bec1eccf976c Hot restart of Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 1102 diff changeset	1042 {
1452 b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	1043 LOG(WARNING) << "The DICOM server is disabled";
1645 1558b3226b18 IHttpExceptionFormatter Sebastien Jodogne <s.jodogne@gmail.com> parents: 1632 diff changeset	1044 return StartHttpServer(context, restApi, plugins);
1103 bec1eccf976c Hot restart of Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 1102 diff changeset	1045 }
2940 4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2903 diff changeset	1046 else
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2903 diff changeset	1047 {
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2903 diff changeset	1048 MyDicomServerFactory serverFactory(context);
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2903 diff changeset	1049 OrthancApplicationEntityFilter dicomFilter(context);
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2903 diff changeset	1050 ModalitiesFromConfiguration modalities;
2381 b8969010b534 uncoupling DCMTK primitives from Orthanc::Configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2375 diff changeset	1051
2940 4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2903 diff changeset	1052 // Setup the DICOM server
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2903 diff changeset	1053 DicomServer dicomServer;
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2903 diff changeset	1054 dicomServer.SetRemoteModalities(modalities);
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2903 diff changeset	1055 dicomServer.SetStoreRequestHandlerFactory(serverFactory);
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2903 diff changeset	1056 dicomServer.SetMoveRequestHandlerFactory(serverFactory);
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2903 diff changeset	1057 dicomServer.SetFindRequestHandlerFactory(serverFactory);
3604 e327b44780bb abstraction: storage commitment handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 3537 diff changeset	1058 dicomServer.SetStorageCommitmentRequestHandlerFactory(serverFactory);
2069 fabf7820d1f1 New configuration options: "DicomScuTimeout" and "DicomScpTimeout" + validation of non-negative options Sebastien Jodogne <s.jodogne@gmail.com> parents: 2018 diff changeset	1059
2940 4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2903 diff changeset	1060 {
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2903 diff changeset	1061 OrthancConfiguration::ReaderLock lock;
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2903 diff changeset	1062 dicomServer.SetCalledApplicationEntityTitleCheck(lock.GetConfiguration().GetBooleanParameter("DicomCheckCalledAet", false));
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2903 diff changeset	1063 dicomServer.SetAssociationTimeout(lock.GetConfiguration().GetUnsignedIntegerParameter("DicomScpTimeout", 30));
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2903 diff changeset	1064 dicomServer.SetPortNumber(lock.GetConfiguration().GetUnsignedIntegerParameter("DicomPort", 4242));
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2903 diff changeset	1065 dicomServer.SetApplicationEntityTitle(lock.GetConfiguration().GetStringParameter("DicomAet", "ORTHANC"));
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2903 diff changeset	1066 }
1786 164d78911382 primitives to handle dicom worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1781 diff changeset	1067
2136 dd609a99d39a uniformization of the macro naming Sebastien Jodogne <s.jodogne@gmail.com> parents: 2133 diff changeset	1068 #if ORTHANC_ENABLE_PLUGINS == 1
2940 4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2903 diff changeset	1069 if (plugins != NULL)
1995 f0acfa753973 New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1987 diff changeset	1070 {
2940 4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2903 diff changeset	1071 if (plugins->HasWorklistHandler())
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2903 diff changeset	1072 {
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2903 diff changeset	1073 dicomServer.SetWorklistRequestHandlerFactory(*plugins);
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2903 diff changeset	1074 }
1999 364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	1075
2940 4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2903 diff changeset	1076 if (plugins->HasFindHandler())
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2903 diff changeset	1077 {
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2903 diff changeset	1078 dicomServer.SetFindRequestHandlerFactory(*plugins);
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2903 diff changeset	1079 }
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2903 diff changeset	1080
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2903 diff changeset	1081 if (plugins->HasMoveHandler())
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2903 diff changeset	1082 {
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2903 diff changeset	1083 dicomServer.SetMoveRequestHandlerFactory(*plugins);
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2903 diff changeset	1084 }
1999 364cc624eb65 New URI "/modalities/.../move" to issue C-Move SCU requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1995 diff changeset	1085 }
1800 30e97a1f4093 callback for handling worklists with plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1799 diff changeset	1086 #endif
1786 164d78911382 primitives to handle dicom worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1781 diff changeset	1087
2940 4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2903 diff changeset	1088 dicomServer.SetApplicationEntityFilter(dicomFilter);
1452 b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	1089
2940 4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2903 diff changeset	1090 if (dicomServer.GetPortNumber() < 1024)
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2903 diff changeset	1091 {
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2903 diff changeset	1092 LOG(WARNING) << "The DICOM port is privileged ("
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2903 diff changeset	1093 << dicomServer.GetPortNumber() << " is below 1024), "
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2903 diff changeset	1094 << "make sure you run Orthanc as root/administrator";
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2903 diff changeset	1095 }
1949 d90f737f2dde warn about the use of privileged ports Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	1096
2940 4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2903 diff changeset	1097 dicomServer.Start();
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2903 diff changeset	1098 LOG(WARNING) << "DICOM server listening with AET " << dicomServer.GetApplicationEntityTitle()
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2903 diff changeset	1099 << " on port: " << dicomServer.GetPortNumber();
1452 b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	1100
2940 4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2903 diff changeset	1101 bool restart = false;
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2903 diff changeset	1102 ErrorCode error = ErrorCode_Success;
1675 131136aeeaa7 improved exception handling in the main program Sebastien Jodogne <s.jodogne@gmail.com> parents: 1672 diff changeset	1103
2940 4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2903 diff changeset	1104 try
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2903 diff changeset	1105 {
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2903 diff changeset	1106 restart = StartHttpServer(context, restApi, plugins);
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2903 diff changeset	1107 }
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2903 diff changeset	1108 catch (OrthancException& e)
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2903 diff changeset	1109 {
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2903 diff changeset	1110 error = e.GetErrorCode();
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2903 diff changeset	1111 }
1452 b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	1112
2940 4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2903 diff changeset	1113 dicomServer.Stop();
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2903 diff changeset	1114 LOG(WARNING) << " DICOM server has stopped";
1452 b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	1115
2940 4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2903 diff changeset	1116 serverFactory.Done();
1452 b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	1117
2940 4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2903 diff changeset	1118 if (error != ErrorCode_Success)
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2903 diff changeset	1119 {
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2903 diff changeset	1120 throw OrthancException(error);
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2903 diff changeset	1121 }
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2903 diff changeset	1122
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2903 diff changeset	1123 return restart;
1675 131136aeeaa7 improved exception handling in the main program Sebastien Jodogne <s.jodogne@gmail.com> parents: 1672 diff changeset	1124 }
1452 b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	1125 }
b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	1126
b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	1127
b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	1128 static bool ConfigureHttpHandler(ServerContext& context,
2815 925d8dc03a23 unserialization of jobs from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2788 diff changeset	1129 OrthancPlugins *plugins,
925d8dc03a23 unserialization of jobs from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2788 diff changeset	1130 bool loadJobsFromDatabase)
1452 b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	1131 {
2136 dd609a99d39a uniformization of the macro naming Sebastien Jodogne <s.jodogne@gmail.com> parents: 2133 diff changeset	1132 #if ORTHANC_ENABLE_PLUGINS == 1
1452 b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	1133 // By order of priority, first apply the "plugins" layer, so that
b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	1134 // plugins can overwrite the built-in REST API of Orthanc
b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	1135 if (plugins)
1103 bec1eccf976c Hot restart of Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 1102 diff changeset	1136 {
1452 b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	1137 assert(context.HasPlugins());
b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	1138 context.GetHttpHandler().Register(*plugins, false);
1103 bec1eccf976c Hot restart of Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 1102 diff changeset	1139 }
1632 eb8fbcf008b5 fix build with plugins disabled Sebastien Jodogne <s.jodogne@gmail.com> parents: 1630 diff changeset	1140 #endif
1103 bec1eccf976c Hot restart of Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 1102 diff changeset	1141
1452 b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	1142 // Secondly, apply the "static resources" layer
1443 895ab369d63c refactoring: OrthancHttpHandler Sebastien Jodogne <s.jodogne@gmail.com> parents: 1437 diff changeset	1143 #if ORTHANC_STANDALONE == 1
895ab369d63c refactoring: OrthancHttpHandler Sebastien Jodogne <s.jodogne@gmail.com> parents: 1437 diff changeset	1144 EmbeddedResourceHttpHandler staticResources("/app", EmbeddedResources::ORTHANC_EXPLORER);
895ab369d63c refactoring: OrthancHttpHandler Sebastien Jodogne <s.jodogne@gmail.com> parents: 1437 diff changeset	1145 #else
895ab369d63c refactoring: OrthancHttpHandler Sebastien Jodogne <s.jodogne@gmail.com> parents: 1437 diff changeset	1146 FilesystemHttpHandler staticResources("/app", ORTHANC_PATH "/OrthancExplorer");
895ab369d63c refactoring: OrthancHttpHandler Sebastien Jodogne <s.jodogne@gmail.com> parents: 1437 diff changeset	1147 #endif
895ab369d63c refactoring: OrthancHttpHandler Sebastien Jodogne <s.jodogne@gmail.com> parents: 1437 diff changeset	1148
1452 b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	1149 context.GetHttpHandler().Register(staticResources, false);
1135 67c3c1e4a6e0 index-only mode, and custom storage area with plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1134 diff changeset	1150
1452 b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	1151 // Thirdly, consider the built-in REST API of Orthanc
b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	1152 OrthancRestApi restApi(context);
b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	1153 context.GetHttpHandler().Register(restApi, true);
1103 bec1eccf976c Hot restart of Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 1102 diff changeset	1154
2815 925d8dc03a23 unserialization of jobs from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2788 diff changeset	1155 context.SetupJobsEngine(false /* not running unit tests */, loadJobsFromDatabase);
925d8dc03a23 unserialization of jobs from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2788 diff changeset	1156
925d8dc03a23 unserialization of jobs from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2788 diff changeset	1157 bool restart = StartDicomServer(context, restApi, plugins);
925d8dc03a23 unserialization of jobs from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2788 diff changeset	1158
925d8dc03a23 unserialization of jobs from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2788 diff changeset	1159 context.Stop();
925d8dc03a23 unserialization of jobs from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2788 diff changeset	1160
925d8dc03a23 unserialization of jobs from plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2788 diff changeset	1161 return restart;
1103 bec1eccf976c Hot restart of Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 1102 diff changeset	1162 }
bec1eccf976c Hot restart of Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 1102 diff changeset	1163
bec1eccf976c Hot restart of Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 1102 diff changeset	1164
2299 03982a0db696 Fix issue #29 (more consistent handling of the "--upgrade" argument) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2295 diff changeset	1165 static void UpgradeDatabase(IDatabaseWrapper& database,
03982a0db696 Fix issue #29 (more consistent handling of the "--upgrade" argument) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2295 diff changeset	1166 IStorageArea& storageArea)
1615 c40fe92a68e7 Primitives to upgrade the database version in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1592 diff changeset	1167 {
1668 de1413733c97 reconstructing main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1666 diff changeset	1168 // Upgrade the schema of the database, if needed
1615 c40fe92a68e7 Primitives to upgrade the database version in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1592 diff changeset	1169 unsigned int currentVersion = database.GetDatabaseVersion();
2299 03982a0db696 Fix issue #29 (more consistent handling of the "--upgrade" argument) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2295 diff changeset	1170
03982a0db696 Fix issue #29 (more consistent handling of the "--upgrade" argument) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2295 diff changeset	1171 LOG(WARNING) << "Starting the upgrade of the database schema";
03982a0db696 Fix issue #29 (more consistent handling of the "--upgrade" argument) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2295 diff changeset	1172 LOG(WARNING) << "Current database version: " << currentVersion;
03982a0db696 Fix issue #29 (more consistent handling of the "--upgrade" argument) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2295 diff changeset	1173 LOG(WARNING) << "Database version expected by Orthanc: " << ORTHANC_DATABASE_VERSION;
03982a0db696 Fix issue #29 (more consistent handling of the "--upgrade" argument) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2295 diff changeset	1174
1669 a412ad57f0f9 refactoring of sample plugins, OrthancPluginReconstructMainDicomTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1668 diff changeset	1175 if (currentVersion == ORTHANC_DATABASE_VERSION)
1615 c40fe92a68e7 Primitives to upgrade the database version in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1592 diff changeset	1176 {
2299 03982a0db696 Fix issue #29 (more consistent handling of the "--upgrade" argument) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2295 diff changeset	1177 LOG(WARNING) << "No upgrade is needed, start Orthanc without the \"--upgrade\" argument";
03982a0db696 Fix issue #29 (more consistent handling of the "--upgrade" argument) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2295 diff changeset	1178 return;
1615 c40fe92a68e7 Primitives to upgrade the database version in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1592 diff changeset	1179 }
c40fe92a68e7 Primitives to upgrade the database version in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1592 diff changeset	1180
1669 a412ad57f0f9 refactoring of sample plugins, OrthancPluginReconstructMainDicomTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1668 diff changeset	1181 if (currentVersion > ORTHANC_DATABASE_VERSION)
1666 d7039be97eeb better command-line options handling Sebastien Jodogne <s.jodogne@gmail.com> parents: 1651 diff changeset	1182 {
2955 bbfd95a0c429 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 2952 diff changeset	1183 throw OrthancException(ErrorCode_IncompatibleDatabaseVersion,
bbfd95a0c429 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 2952 diff changeset	1184 "The version of the database schema (" +
bbfd95a0c429 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 2952 diff changeset	1185 boost::lexical_cast<std::string>(currentVersion) +
bbfd95a0c429 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 2952 diff changeset	1186 ") is too recent for this version of Orthanc. Please upgrade Orthanc.");
1669 a412ad57f0f9 refactoring of sample plugins, OrthancPluginReconstructMainDicomTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1668 diff changeset	1187 }
a412ad57f0f9 refactoring of sample plugins, OrthancPluginReconstructMainDicomTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1668 diff changeset	1188
a412ad57f0f9 refactoring of sample plugins, OrthancPluginReconstructMainDicomTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1668 diff changeset	1189 LOG(WARNING) << "Upgrading the database from schema version "
a412ad57f0f9 refactoring of sample plugins, OrthancPluginReconstructMainDicomTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1668 diff changeset	1190 << currentVersion << " to " << ORTHANC_DATABASE_VERSION;
1869 9af3b492b010 invitation to replicate if upgrade fails Sebastien Jodogne <s.jodogne@gmail.com> parents: 1866 diff changeset	1191
9af3b492b010 invitation to replicate if upgrade fails Sebastien Jodogne <s.jodogne@gmail.com> parents: 1866 diff changeset	1192 try
9af3b492b010 invitation to replicate if upgrade fails Sebastien Jodogne <s.jodogne@gmail.com> parents: 1866 diff changeset	1193 {
9af3b492b010 invitation to replicate if upgrade fails Sebastien Jodogne <s.jodogne@gmail.com> parents: 1866 diff changeset	1194 database.Upgrade(ORTHANC_DATABASE_VERSION, storageArea);
9af3b492b010 invitation to replicate if upgrade fails Sebastien Jodogne <s.jodogne@gmail.com> parents: 1866 diff changeset	1195 }
9af3b492b010 invitation to replicate if upgrade fails Sebastien Jodogne <s.jodogne@gmail.com> parents: 1866 diff changeset	1196 catch (OrthancException&)
9af3b492b010 invitation to replicate if upgrade fails Sebastien Jodogne <s.jodogne@gmail.com> parents: 1866 diff changeset	1197 {
9af3b492b010 invitation to replicate if upgrade fails Sebastien Jodogne <s.jodogne@gmail.com> parents: 1866 diff changeset	1198 LOG(ERROR) << "Unable to run the automated upgrade, please use the replication instructions: "
3135 2b81d44e7b33 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3126 diff changeset	1199 << "http://book.orthanc-server.com/users/replication.html";
1869 9af3b492b010 invitation to replicate if upgrade fails Sebastien Jodogne <s.jodogne@gmail.com> parents: 1866 diff changeset	1200 throw;
9af3b492b010 invitation to replicate if upgrade fails Sebastien Jodogne <s.jodogne@gmail.com> parents: 1866 diff changeset	1201 }
1669 a412ad57f0f9 refactoring of sample plugins, OrthancPluginReconstructMainDicomTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1668 diff changeset	1202
a412ad57f0f9 refactoring of sample plugins, OrthancPluginReconstructMainDicomTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1668 diff changeset	1203 // Sanity check
a412ad57f0f9 refactoring of sample plugins, OrthancPluginReconstructMainDicomTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1668 diff changeset	1204 currentVersion = database.GetDatabaseVersion();
a412ad57f0f9 refactoring of sample plugins, OrthancPluginReconstructMainDicomTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1668 diff changeset	1205 if (ORTHANC_DATABASE_VERSION != currentVersion)
a412ad57f0f9 refactoring of sample plugins, OrthancPluginReconstructMainDicomTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1668 diff changeset	1206 {
2955 bbfd95a0c429 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 2952 diff changeset	1207 throw OrthancException(ErrorCode_IncompatibleDatabaseVersion,
bbfd95a0c429 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 2952 diff changeset	1208 "The database schema was not properly upgraded, it is still at version " +
bbfd95a0c429 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 2952 diff changeset	1209 boost::lexical_cast<std::string>(currentVersion));
1669 a412ad57f0f9 refactoring of sample plugins, OrthancPluginReconstructMainDicomTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1668 diff changeset	1210 }
2299 03982a0db696 Fix issue #29 (more consistent handling of the "--upgrade" argument) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2295 diff changeset	1211 else
03982a0db696 Fix issue #29 (more consistent handling of the "--upgrade" argument) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2295 diff changeset	1212 {
03982a0db696 Fix issue #29 (more consistent handling of the "--upgrade" argument) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2295 diff changeset	1213 LOG(WARNING) << "The database schema was successfully upgraded, "
03982a0db696 Fix issue #29 (more consistent handling of the "--upgrade" argument) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2295 diff changeset	1214 << "you can now start Orthanc without the \"--upgrade\" argument";
03982a0db696 Fix issue #29 (more consistent handling of the "--upgrade" argument) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2295 diff changeset	1215 }
1615 c40fe92a68e7 Primitives to upgrade the database version in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1592 diff changeset	1216 }
c40fe92a68e7 Primitives to upgrade the database version in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1592 diff changeset	1217
c40fe92a68e7 Primitives to upgrade the database version in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1592 diff changeset	1218
2941 e292798f9980 OrthancConfiguration::SetServerIndex() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2940 diff changeset	1219
e292798f9980 OrthancConfiguration::SetServerIndex() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2940 diff changeset	1220 namespace
e292798f9980 OrthancConfiguration::SetServerIndex() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2940 diff changeset	1221 {
e292798f9980 OrthancConfiguration::SetServerIndex() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2940 diff changeset	1222 class ServerContextConfigurator : public boost::noncopyable
e292798f9980 OrthancConfiguration::SetServerIndex() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2940 diff changeset	1223 {
e292798f9980 OrthancConfiguration::SetServerIndex() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2940 diff changeset	1224 private:
e292798f9980 OrthancConfiguration::SetServerIndex() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2940 diff changeset	1225 ServerContext& context_;
e292798f9980 OrthancConfiguration::SetServerIndex() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2940 diff changeset	1226 OrthancPlugins* plugins_;
e292798f9980 OrthancConfiguration::SetServerIndex() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2940 diff changeset	1227
e292798f9980 OrthancConfiguration::SetServerIndex() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2940 diff changeset	1228 public:
e292798f9980 OrthancConfiguration::SetServerIndex() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2940 diff changeset	1229 ServerContextConfigurator(ServerContext& context,
e292798f9980 OrthancConfiguration::SetServerIndex() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2940 diff changeset	1230 OrthancPlugins* plugins) :
e292798f9980 OrthancConfiguration::SetServerIndex() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2940 diff changeset	1231 context_(context),
e292798f9980 OrthancConfiguration::SetServerIndex() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2940 diff changeset	1232 plugins_(plugins)
e292798f9980 OrthancConfiguration::SetServerIndex() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2940 diff changeset	1233 {
e292798f9980 OrthancConfiguration::SetServerIndex() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2940 diff changeset	1234 {
e292798f9980 OrthancConfiguration::SetServerIndex() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2940 diff changeset	1235 OrthancConfiguration::WriterLock lock;
e292798f9980 OrthancConfiguration::SetServerIndex() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2940 diff changeset	1236 lock.GetConfiguration().SetServerIndex(context.GetIndex());
e292798f9980 OrthancConfiguration::SetServerIndex() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2940 diff changeset	1237 }
e292798f9980 OrthancConfiguration::SetServerIndex() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2940 diff changeset	1238
e292798f9980 OrthancConfiguration::SetServerIndex() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2940 diff changeset	1239 #if ORTHANC_ENABLE_PLUGINS == 1
e292798f9980 OrthancConfiguration::SetServerIndex() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2940 diff changeset	1240 if (plugins_ != NULL)
e292798f9980 OrthancConfiguration::SetServerIndex() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2940 diff changeset	1241 {
e292798f9980 OrthancConfiguration::SetServerIndex() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2940 diff changeset	1242 plugins_->SetServerContext(context_);
e292798f9980 OrthancConfiguration::SetServerIndex() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2940 diff changeset	1243 context_.SetPlugins(*plugins_);
e292798f9980 OrthancConfiguration::SetServerIndex() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2940 diff changeset	1244 }
e292798f9980 OrthancConfiguration::SetServerIndex() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2940 diff changeset	1245 #endif
e292798f9980 OrthancConfiguration::SetServerIndex() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2940 diff changeset	1246 }
e292798f9980 OrthancConfiguration::SetServerIndex() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2940 diff changeset	1247
e292798f9980 OrthancConfiguration::SetServerIndex() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2940 diff changeset	1248 ~ServerContextConfigurator()
e292798f9980 OrthancConfiguration::SetServerIndex() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2940 diff changeset	1249 {
e292798f9980 OrthancConfiguration::SetServerIndex() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2940 diff changeset	1250 {
e292798f9980 OrthancConfiguration::SetServerIndex() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2940 diff changeset	1251 OrthancConfiguration::WriterLock lock;
e292798f9980 OrthancConfiguration::SetServerIndex() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2940 diff changeset	1252 lock.GetConfiguration().ResetServerIndex();
e292798f9980 OrthancConfiguration::SetServerIndex() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2940 diff changeset	1253 }
e292798f9980 OrthancConfiguration::SetServerIndex() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2940 diff changeset	1254
e292798f9980 OrthancConfiguration::SetServerIndex() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2940 diff changeset	1255 #if ORTHANC_ENABLE_PLUGINS == 1
e292798f9980 OrthancConfiguration::SetServerIndex() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2940 diff changeset	1256 if (plugins_ != NULL)
e292798f9980 OrthancConfiguration::SetServerIndex() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2940 diff changeset	1257 {
e292798f9980 OrthancConfiguration::SetServerIndex() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2940 diff changeset	1258 plugins_->ResetServerContext();
e292798f9980 OrthancConfiguration::SetServerIndex() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2940 diff changeset	1259 context_.ResetPlugins();
e292798f9980 OrthancConfiguration::SetServerIndex() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2940 diff changeset	1260 }
e292798f9980 OrthancConfiguration::SetServerIndex() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2940 diff changeset	1261 #endif
e292798f9980 OrthancConfiguration::SetServerIndex() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2940 diff changeset	1262 }
e292798f9980 OrthancConfiguration::SetServerIndex() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2940 diff changeset	1263 };
e292798f9980 OrthancConfiguration::SetServerIndex() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2940 diff changeset	1264 }
e292798f9980 OrthancConfiguration::SetServerIndex() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2940 diff changeset	1265
e292798f9980 OrthancConfiguration::SetServerIndex() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2940 diff changeset	1266
1452 b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	1267 static bool ConfigureServerContext(IDatabaseWrapper& database,
b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	1268 IStorageArea& storageArea,
2671 06c0a6b8a871 new command-line argument: --no-jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	1269 OrthancPlugins *plugins,
06c0a6b8a871 new command-line argument: --no-jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	1270 bool loadJobsFromDatabase)
1452 b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	1271 {
2950 dc18d5804746 support of JobsHistorySize set to zero Sebastien Jodogne <s.jodogne@gmail.com> parents: 2946 diff changeset	1272 size_t maxCompletedJobs;
dc18d5804746 support of JobsHistorySize set to zero Sebastien Jodogne <s.jodogne@gmail.com> parents: 2946 diff changeset	1273
2940 4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2903 diff changeset	1274 {
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2903 diff changeset	1275 OrthancConfiguration::ReaderLock lock;
2069 fabf7820d1f1 New configuration options: "DicomScuTimeout" and "DicomScpTimeout" + validation of non-negative options Sebastien Jodogne <s.jodogne@gmail.com> parents: 2018 diff changeset	1276
2940 4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2903 diff changeset	1277 // These configuration options must be set before creating the
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2903 diff changeset	1278 // ServerContext, otherwise the possible Lua scripts will not be
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2903 diff changeset	1279 // able to properly issue HTTP/HTTPS queries
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2903 diff changeset	1280 HttpClient::ConfigureSsl(lock.GetConfiguration().GetBooleanParameter("HttpsVerifyPeers", true),
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2903 diff changeset	1281 lock.GetConfiguration().InterpretStringParameterAsPath
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2903 diff changeset	1282 (lock.GetConfiguration().GetStringParameter("HttpsCACertificates", "")));
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2903 diff changeset	1283 HttpClient::SetDefaultVerbose(lock.GetConfiguration().GetBooleanParameter("HttpVerbose", false));
3428 6add197274b1 default value of HttpTimeout is now 60 seconds Sebastien Jodogne <s.jodogne@gmail.com> parents: 3404 diff changeset	1284
6add197274b1 default value of HttpTimeout is now 60 seconds Sebastien Jodogne <s.jodogne@gmail.com> parents: 3404 diff changeset	1285 // The value "0" below makes the class HttpClient use its default
6add197274b1 default value of HttpTimeout is now 60 seconds Sebastien Jodogne <s.jodogne@gmail.com> parents: 3404 diff changeset	1286 // value (DEFAULT_HTTP_TIMEOUT = 60 seconds in Orthanc 1.5.7)
2940 4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2903 diff changeset	1287 HttpClient::SetDefaultTimeout(lock.GetConfiguration().GetUnsignedIntegerParameter("HttpTimeout", 0));
3428 6add197274b1 default value of HttpTimeout is now 60 seconds Sebastien Jodogne <s.jodogne@gmail.com> parents: 3404 diff changeset	1288
2940 4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2903 diff changeset	1289 HttpClient::SetDefaultProxy(lock.GetConfiguration().GetStringParameter("HttpProxy", ""));
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2903 diff changeset	1290
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2903 diff changeset	1291 DicomUserConnection::SetDefaultTimeout(lock.GetConfiguration().GetUnsignedIntegerParameter("DicomScuTimeout", 10));
2950 dc18d5804746 support of JobsHistorySize set to zero Sebastien Jodogne <s.jodogne@gmail.com> parents: 2946 diff changeset	1292
dc18d5804746 support of JobsHistorySize set to zero Sebastien Jodogne <s.jodogne@gmail.com> parents: 2946 diff changeset	1293 maxCompletedJobs = lock.GetConfiguration().GetUnsignedIntegerParameter("JobsHistorySize", 10);
3164 b79ec21747a1 warning Sebastien Jodogne <s.jodogne@gmail.com> parents: 3139 diff changeset	1294
b79ec21747a1 warning Sebastien Jodogne <s.jodogne@gmail.com> parents: 3139 diff changeset	1295 if (maxCompletedJobs == 0)
b79ec21747a1 warning Sebastien Jodogne <s.jodogne@gmail.com> parents: 3139 diff changeset	1296 {
b79ec21747a1 warning Sebastien Jodogne <s.jodogne@gmail.com> parents: 3139 diff changeset	1297 LOG(WARNING) << "Setting option \"JobsHistorySize\" to zero is not recommended";
b79ec21747a1 warning Sebastien Jodogne <s.jodogne@gmail.com> parents: 3139 diff changeset	1298 }
2950 dc18d5804746 support of JobsHistorySize set to zero Sebastien Jodogne <s.jodogne@gmail.com> parents: 2946 diff changeset	1299 }
dc18d5804746 support of JobsHistorySize set to zero Sebastien Jodogne <s.jodogne@gmail.com> parents: 2946 diff changeset	1300
dc18d5804746 support of JobsHistorySize set to zero Sebastien Jodogne <s.jodogne@gmail.com> parents: 2946 diff changeset	1301 ServerContext context(database, storageArea, false /* not running unit tests */, maxCompletedJobs);
dc18d5804746 support of JobsHistorySize set to zero Sebastien Jodogne <s.jodogne@gmail.com> parents: 2946 diff changeset	1302
dc18d5804746 support of JobsHistorySize set to zero Sebastien Jodogne <s.jodogne@gmail.com> parents: 2946 diff changeset	1303 {
dc18d5804746 support of JobsHistorySize set to zero Sebastien Jodogne <s.jodogne@gmail.com> parents: 2946 diff changeset	1304 OrthancConfiguration::ReaderLock lock;
dc18d5804746 support of JobsHistorySize set to zero Sebastien Jodogne <s.jodogne@gmail.com> parents: 2946 diff changeset	1305
2940 4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2903 diff changeset	1306 context.SetCompressionEnabled(lock.GetConfiguration().GetBooleanParameter("StorageCompression", false));
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2903 diff changeset	1307 context.SetStoreMD5ForAttachments(lock.GetConfiguration().GetBooleanParameter("StoreMD5ForAttachments", true));
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2903 diff changeset	1308
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2903 diff changeset	1309 // New option in Orthanc 1.4.2
3813 aaaa442bfe39 moving SetOverwriteInstances from ServerIndex to ServerContext Sebastien Jodogne <s.jodogne@gmail.com> parents: 3801 diff changeset	1310 context.SetOverwriteInstances(lock.GetConfiguration().GetBooleanParameter("OverwriteInstances", false));
2069 fabf7820d1f1 New configuration options: "DicomScuTimeout" and "DicomScpTimeout" + validation of non-negative options Sebastien Jodogne <s.jodogne@gmail.com> parents: 2018 diff changeset	1311
2940 4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2903 diff changeset	1312 try
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2903 diff changeset	1313 {
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2903 diff changeset	1314 context.GetIndex().SetMaximumPatientCount(lock.GetConfiguration().GetUnsignedIntegerParameter("MaximumPatientCount", 0));
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2903 diff changeset	1315 }
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2903 diff changeset	1316 catch (...)
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2903 diff changeset	1317 {
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2903 diff changeset	1318 context.GetIndex().SetMaximumPatientCount(0);
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2903 diff changeset	1319 }
2825 8aa6aef11b70 New configuration option "OverwriteInstances" to choose how duplicate SOPInstanceUID are handled Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	1320
2940 4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2903 diff changeset	1321 try
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2903 diff changeset	1322 {
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2903 diff changeset	1323 uint64_t size = lock.GetConfiguration().GetUnsignedIntegerParameter("MaximumStorageSize", 0);
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2903 diff changeset	1324 context.GetIndex().SetMaximumStorageSize(size * 1024 * 1024);
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2903 diff changeset	1325 }
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2903 diff changeset	1326 catch (...)
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2903 diff changeset	1327 {
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2903 diff changeset	1328 context.GetIndex().SetMaximumStorageSize(0);
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2903 diff changeset	1329 }
1452 b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	1330 }
b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	1331
b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	1332 {
2941 e292798f9980 OrthancConfiguration::SetServerIndex() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2940 diff changeset	1333 ServerContextConfigurator configurator(context, plugins);
2946 2e751f615e03 new configuration options: DicomModalitiesInDatabase and OrthancPeersInDatabase Sebastien Jodogne <s.jodogne@gmail.com> parents: 2941 diff changeset	1334
2e751f615e03 new configuration options: DicomModalitiesInDatabase and OrthancPeersInDatabase Sebastien Jodogne <s.jodogne@gmail.com> parents: 2941 diff changeset	1335 {
2e751f615e03 new configuration options: DicomModalitiesInDatabase and OrthancPeersInDatabase Sebastien Jodogne <s.jodogne@gmail.com> parents: 2941 diff changeset	1336 OrthancConfiguration::WriterLock lock;
2e751f615e03 new configuration options: DicomModalitiesInDatabase and OrthancPeersInDatabase Sebastien Jodogne <s.jodogne@gmail.com> parents: 2941 diff changeset	1337 lock.GetConfiguration().LoadModalitiesAndPeers();
2e751f615e03 new configuration options: DicomModalitiesInDatabase and OrthancPeersInDatabase Sebastien Jodogne <s.jodogne@gmail.com> parents: 2941 diff changeset	1338 }
2e751f615e03 new configuration options: DicomModalitiesInDatabase and OrthancPeersInDatabase Sebastien Jodogne <s.jodogne@gmail.com> parents: 2941 diff changeset	1339
2941 e292798f9980 OrthancConfiguration::SetServerIndex() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2940 diff changeset	1340 return ConfigureHttpHandler(context, plugins, loadJobsFromDatabase);
1675 131136aeeaa7 improved exception handling in the main program Sebastien Jodogne <s.jodogne@gmail.com> parents: 1672 diff changeset	1341 }
1452 b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	1342 }
b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	1343
b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	1344
1672 4c5a85c3ff43 sample database plugin now working Sebastien Jodogne <s.jodogne@gmail.com> parents: 1669 diff changeset	1345 static bool ConfigureDatabase(IDatabaseWrapper& database,
4c5a85c3ff43 sample database plugin now working Sebastien Jodogne <s.jodogne@gmail.com> parents: 1669 diff changeset	1346 IStorageArea& storageArea,
4c5a85c3ff43 sample database plugin now working Sebastien Jodogne <s.jodogne@gmail.com> parents: 1669 diff changeset	1347 OrthancPlugins *plugins,
2671 06c0a6b8a871 new command-line argument: --no-jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	1348 bool upgradeDatabase,
06c0a6b8a871 new command-line argument: --no-jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	1349 bool loadJobsFromDatabase)
1672 4c5a85c3ff43 sample database plugin now working Sebastien Jodogne <s.jodogne@gmail.com> parents: 1669 diff changeset	1350 {
4c5a85c3ff43 sample database plugin now working Sebastien Jodogne <s.jodogne@gmail.com> parents: 1669 diff changeset	1351 database.Open();
2299 03982a0db696 Fix issue #29 (more consistent handling of the "--upgrade" argument) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2295 diff changeset	1352
03982a0db696 Fix issue #29 (more consistent handling of the "--upgrade" argument) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2295 diff changeset	1353 unsigned int currentVersion = database.GetDatabaseVersion();
2699 52217dc47a4e new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes am@osimis.io parents: 2633 diff changeset	1354
2299 03982a0db696 Fix issue #29 (more consistent handling of the "--upgrade" argument) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2295 diff changeset	1355 if (upgradeDatabase)
1672 4c5a85c3ff43 sample database plugin now working Sebastien Jodogne <s.jodogne@gmail.com> parents: 1669 diff changeset	1356 {
2299 03982a0db696 Fix issue #29 (more consistent handling of the "--upgrade" argument) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2295 diff changeset	1357 UpgradeDatabase(database, storageArea);
03982a0db696 Fix issue #29 (more consistent handling of the "--upgrade" argument) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2295 diff changeset	1358 return false; // Stop and don't restart Orthanc (cf. issue 29)
03982a0db696 Fix issue #29 (more consistent handling of the "--upgrade" argument) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2295 diff changeset	1359 }
03982a0db696 Fix issue #29 (more consistent handling of the "--upgrade" argument) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2295 diff changeset	1360 else if (currentVersion != ORTHANC_DATABASE_VERSION)
03982a0db696 Fix issue #29 (more consistent handling of the "--upgrade" argument) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2295 diff changeset	1361 {
2955 bbfd95a0c429 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 2952 diff changeset	1362 throw OrthancException(ErrorCode_IncompatibleDatabaseVersion,
3018 e3b5c07146a3 speeding up the computation of the size of the attachments in SQLite Sebastien Jodogne <s.jodogne@gmail.com> parents: 2955 diff changeset	1363 "The database schema must be upgraded from version " +
2955 bbfd95a0c429 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 2952 diff changeset	1364 boost::lexical_cast<std::string>(currentVersion) + " to " +
bbfd95a0c429 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 2952 diff changeset	1365 boost::lexical_cast<std::string>(ORTHANC_DATABASE_VERSION) +
bbfd95a0c429 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 2952 diff changeset	1366 ": Please run Orthanc with the \"--upgrade\" argument");
1672 4c5a85c3ff43 sample database plugin now working Sebastien Jodogne <s.jodogne@gmail.com> parents: 1669 diff changeset	1367 }
4c5a85c3ff43 sample database plugin now working Sebastien Jodogne <s.jodogne@gmail.com> parents: 1669 diff changeset	1368
2671 06c0a6b8a871 new command-line argument: --no-jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	1369 bool success = ConfigureServerContext
06c0a6b8a871 new command-line argument: --no-jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	1370 (database, storageArea, plugins, loadJobsFromDatabase);
1672 4c5a85c3ff43 sample database plugin now working Sebastien Jodogne <s.jodogne@gmail.com> parents: 1669 diff changeset	1371
4c5a85c3ff43 sample database plugin now working Sebastien Jodogne <s.jodogne@gmail.com> parents: 1669 diff changeset	1372 database.Close();
4c5a85c3ff43 sample database plugin now working Sebastien Jodogne <s.jodogne@gmail.com> parents: 1669 diff changeset	1373
4c5a85c3ff43 sample database plugin now working Sebastien Jodogne <s.jodogne@gmail.com> parents: 1669 diff changeset	1374 return success;
4c5a85c3ff43 sample database plugin now working Sebastien Jodogne <s.jodogne@gmail.com> parents: 1669 diff changeset	1375 }
4c5a85c3ff43 sample database plugin now working Sebastien Jodogne <s.jodogne@gmail.com> parents: 1669 diff changeset	1376
4c5a85c3ff43 sample database plugin now working Sebastien Jodogne <s.jodogne@gmail.com> parents: 1669 diff changeset	1377
1452 b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	1378 static bool ConfigurePlugins(int argc,
1615 c40fe92a68e7 Primitives to upgrade the database version in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1592 diff changeset	1379 char* argv[],
2671 06c0a6b8a871 new command-line argument: --no-jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	1380 bool upgradeDatabase,
06c0a6b8a871 new command-line argument: --no-jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	1381 bool loadJobsFromDatabase)
1452 b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	1382 {
3712 2a170a8f1faf replacing std::auto_ptr by std::unique_ptr Sebastien Jodogne <s.jodogne@gmail.com> parents: 3643 diff changeset	1383 std::unique_ptr<IDatabaseWrapper> databasePtr;
2a170a8f1faf replacing std::auto_ptr by std::unique_ptr Sebastien Jodogne <s.jodogne@gmail.com> parents: 3643 diff changeset	1384 std::unique_ptr<IStorageArea> storage;
1452 b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	1385
2136 dd609a99d39a uniformization of the macro naming Sebastien Jodogne <s.jodogne@gmail.com> parents: 2133 diff changeset	1386 #if ORTHANC_ENABLE_PLUGINS == 1
1452 b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	1387 OrthancPlugins plugins;
b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	1388 plugins.SetCommandLineArguments(argc, argv);
b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	1389 LoadPlugins(plugins);
b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	1390
b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	1391 IDatabaseWrapper* database = NULL;
1630 ffd23c0104af "/system" URI gives information about the plugins used for storage area and DB back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1615 diff changeset	1392 if (plugins.HasDatabaseBackend())
1452 b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	1393 {
b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	1394 LOG(WARNING) << "Using a custom database from plugins";
1630 ffd23c0104af "/system" URI gives information about the plugins used for storage area and DB back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1615 diff changeset	1395 database = &plugins.GetDatabaseBackend();
1452 b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	1396 }
b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	1397 else
b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	1398 {
2940 4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2903 diff changeset	1399 databasePtr.reset(CreateDatabaseWrapper());
1452 b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	1400 database = databasePtr.get();
b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	1401 }
b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	1402
b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	1403 if (plugins.HasStorageArea())
b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	1404 {
b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	1405 LOG(WARNING) << "Using a custom storage area from plugins";
b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	1406 storage.reset(plugins.CreateStorageArea());
b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	1407 }
b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	1408 else
b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	1409 {
2940 4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2903 diff changeset	1410 storage.reset(CreateStorageArea());
1452 b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	1411 }
b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	1412
b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	1413 assert(database != NULL);
b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	1414 assert(storage.get() != NULL);
b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	1415
2671 06c0a6b8a871 new command-line argument: --no-jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	1416 return ConfigureDatabase(database, storage, &plugins,
06c0a6b8a871 new command-line argument: --no-jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	1417 upgradeDatabase, loadJobsFromDatabase);
1452 b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	1418
2136 dd609a99d39a uniformization of the macro naming Sebastien Jodogne <s.jodogne@gmail.com> parents: 2133 diff changeset	1419 #elif ORTHANC_ENABLE_PLUGINS == 0
1452 b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	1420 // The plugins are disabled
3048 8b331be57606 fix build without plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2955 diff changeset	1421
8b331be57606 fix build without plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2955 diff changeset	1422 databasePtr.reset(CreateDatabaseWrapper());
8b331be57606 fix build without plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2955 diff changeset	1423 storage.reset(CreateStorageArea());
8b331be57606 fix build without plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2955 diff changeset	1424
8b331be57606 fix build without plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2955 diff changeset	1425 assert(databasePtr.get() != NULL);
8b331be57606 fix build without plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 2955 diff changeset	1426 assert(storage.get() != NULL);
1452 b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	1427
2671 06c0a6b8a871 new command-line argument: --no-jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	1428 return ConfigureDatabase(databasePtr, storage, NULL,
06c0a6b8a871 new command-line argument: --no-jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	1429 upgradeDatabase, loadJobsFromDatabase);
1455 a68545767975 Initialize() and Finalize() events in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1452 diff changeset	1430
a68545767975 Initialize() and Finalize() events in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1452 diff changeset	1431 #else
2136 dd609a99d39a uniformization of the macro naming Sebastien Jodogne <s.jodogne@gmail.com> parents: 2133 diff changeset	1432 # error The macro ORTHANC_ENABLE_PLUGINS must be set to 0 or 1
1452 b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	1433 #endif
b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	1434 }
b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	1435
b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	1436
1615 c40fe92a68e7 Primitives to upgrade the database version in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1592 diff changeset	1437 static bool StartOrthanc(int argc,
c40fe92a68e7 Primitives to upgrade the database version in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1592 diff changeset	1438 char* argv[],
2671 06c0a6b8a871 new command-line argument: --no-jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	1439 bool upgradeDatabase,
06c0a6b8a871 new command-line argument: --no-jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	1440 bool loadJobsFromDatabase)
1452 b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	1441 {
2671 06c0a6b8a871 new command-line argument: --no-jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	1442 return ConfigurePlugins(argc, argv, upgradeDatabase, loadJobsFromDatabase);
1452 b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	1443 }
1103 bec1eccf976c Hot restart of Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 1102 diff changeset	1444
893 f57802f8b4dc plugins for windows Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	1445
2079 acb4cd4af771 Performance warning if runtime debug assertions are turned on Sebastien Jodogne <s.jodogne@gmail.com> parents: 2069 diff changeset	1446 static bool DisplayPerformanceWarning()
acb4cd4af771 Performance warning if runtime debug assertions are turned on Sebastien Jodogne <s.jodogne@gmail.com> parents: 2069 diff changeset	1447 {
acb4cd4af771 Performance warning if runtime debug assertions are turned on Sebastien Jodogne <s.jodogne@gmail.com> parents: 2069 diff changeset	1448 (void) DisplayPerformanceWarning; // Disable warning about unused function
acb4cd4af771 Performance warning if runtime debug assertions are turned on Sebastien Jodogne <s.jodogne@gmail.com> parents: 2069 diff changeset	1449 LOG(WARNING) << "Performance warning: Non-release build, runtime debug assertions are turned on";
acb4cd4af771 Performance warning if runtime debug assertions are turned on Sebastien Jodogne <s.jodogne@gmail.com> parents: 2069 diff changeset	1450 return true;
acb4cd4af771 Performance warning if runtime debug assertions are turned on Sebastien Jodogne <s.jodogne@gmail.com> parents: 2069 diff changeset	1451 }
acb4cd4af771 Performance warning if runtime debug assertions are turned on Sebastien Jodogne <s.jodogne@gmail.com> parents: 2069 diff changeset	1452
acb4cd4af771 Performance warning if runtime debug assertions are turned on Sebastien Jodogne <s.jodogne@gmail.com> parents: 2069 diff changeset	1453
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1454 int main(int argc, char* argv[])
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1455 {
1485 27661b33f624 Creation of Logging.h Sebastien Jodogne <s.jodogne@gmail.com> parents: 1455 diff changeset	1456 Logging::Initialize();
133 1969ff16457c help Sebastien Jodogne <s.jodogne@gmail.com> parents: 128 diff changeset	1457
2299 03982a0db696 Fix issue #29 (more consistent handling of the "--upgrade" argument) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2295 diff changeset	1458 bool upgradeDatabase = false;
2671 06c0a6b8a871 new command-line argument: --no-jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	1459 bool loadJobsFromDatabase = true;
1666 d7039be97eeb better command-line options handling Sebastien Jodogne <s.jodogne@gmail.com> parents: 1651 diff changeset	1460 const char* configurationFile = NULL;
d7039be97eeb better command-line options handling Sebastien Jodogne <s.jodogne@gmail.com> parents: 1651 diff changeset	1461
d7039be97eeb better command-line options handling Sebastien Jodogne <s.jodogne@gmail.com> parents: 1651 diff changeset	1462
d7039be97eeb better command-line options handling Sebastien Jodogne <s.jodogne@gmail.com> parents: 1651 diff changeset	1463 /**
d7039be97eeb better command-line options handling Sebastien Jodogne <s.jodogne@gmail.com> parents: 1651 diff changeset	1464 * Parse the command-line options.
d7039be97eeb better command-line options handling Sebastien Jodogne <s.jodogne@gmail.com> parents: 1651 diff changeset	1465 **/
1615 c40fe92a68e7 Primitives to upgrade the database version in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1592 diff changeset	1466
112 80ca409f232f logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 108 diff changeset	1467 for (int i = 1; i < argc; i++)
80ca409f232f logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 108 diff changeset	1468 {
1666 d7039be97eeb better command-line options handling Sebastien Jodogne <s.jodogne@gmail.com> parents: 1651 diff changeset	1469 std::string argument(argv[i]);
d7039be97eeb better command-line options handling Sebastien Jodogne <s.jodogne@gmail.com> parents: 1651 diff changeset	1470
d7039be97eeb better command-line options handling Sebastien Jodogne <s.jodogne@gmail.com> parents: 1651 diff changeset	1471 if (argument.empty())
d7039be97eeb better command-line options handling Sebastien Jodogne <s.jodogne@gmail.com> parents: 1651 diff changeset	1472 {
d7039be97eeb better command-line options handling Sebastien Jodogne <s.jodogne@gmail.com> parents: 1651 diff changeset	1473 // Ignore empty arguments
d7039be97eeb better command-line options handling Sebastien Jodogne <s.jodogne@gmail.com> parents: 1651 diff changeset	1474 }
d7039be97eeb better command-line options handling Sebastien Jodogne <s.jodogne@gmail.com> parents: 1651 diff changeset	1475 else if (argument[0] != '-')
d7039be97eeb better command-line options handling Sebastien Jodogne <s.jodogne@gmail.com> parents: 1651 diff changeset	1476 {
d7039be97eeb better command-line options handling Sebastien Jodogne <s.jodogne@gmail.com> parents: 1651 diff changeset	1477 if (configurationFile != NULL)
d7039be97eeb better command-line options handling Sebastien Jodogne <s.jodogne@gmail.com> parents: 1651 diff changeset	1478 {
d7039be97eeb better command-line options handling Sebastien Jodogne <s.jodogne@gmail.com> parents: 1651 diff changeset	1479 LOG(ERROR) << "More than one configuration path were provided on the command line, aborting";
d7039be97eeb better command-line options handling Sebastien Jodogne <s.jodogne@gmail.com> parents: 1651 diff changeset	1480 return -1;
d7039be97eeb better command-line options handling Sebastien Jodogne <s.jodogne@gmail.com> parents: 1651 diff changeset	1481 }
d7039be97eeb better command-line options handling Sebastien Jodogne <s.jodogne@gmail.com> parents: 1651 diff changeset	1482 else
d7039be97eeb better command-line options handling Sebastien Jodogne <s.jodogne@gmail.com> parents: 1651 diff changeset	1483 {
d7039be97eeb better command-line options handling Sebastien Jodogne <s.jodogne@gmail.com> parents: 1651 diff changeset	1484 // Use the first argument that does not start with a "-" as
d7039be97eeb better command-line options handling Sebastien Jodogne <s.jodogne@gmail.com> parents: 1651 diff changeset	1485 // the configuration file
2018 300599489cab USE_BOOST_LOCALE_BACKENDS Sebastien Jodogne <s.jodogne@gmail.com> parents: 2015 diff changeset	1486
300599489cab USE_BOOST_LOCALE_BACKENDS Sebastien Jodogne <s.jodogne@gmail.com> parents: 2015 diff changeset	1487 // TODO WHAT IS THE ENCODING?
1666 d7039be97eeb better command-line options handling Sebastien Jodogne <s.jodogne@gmail.com> parents: 1651 diff changeset	1488 configurationFile = argv[i];
d7039be97eeb better command-line options handling Sebastien Jodogne <s.jodogne@gmail.com> parents: 1651 diff changeset	1489 }
d7039be97eeb better command-line options handling Sebastien Jodogne <s.jodogne@gmail.com> parents: 1651 diff changeset	1490 }
1733 e1f5ab395297 PrintErrors Sebastien Jodogne <s.jodogne@gmail.com> parents: 1730 diff changeset	1491 else if (argument == "--errors")
e1f5ab395297 PrintErrors Sebastien Jodogne <s.jodogne@gmail.com> parents: 1730 diff changeset	1492 {
e1f5ab395297 PrintErrors Sebastien Jodogne <s.jodogne@gmail.com> parents: 1730 diff changeset	1493 PrintErrors(argv[0]);
e1f5ab395297 PrintErrors Sebastien Jodogne <s.jodogne@gmail.com> parents: 1730 diff changeset	1494 return 0;
e1f5ab395297 PrintErrors Sebastien Jodogne <s.jodogne@gmail.com> parents: 1730 diff changeset	1495 }
1666 d7039be97eeb better command-line options handling Sebastien Jodogne <s.jodogne@gmail.com> parents: 1651 diff changeset	1496 else if (argument == "--help")
133 1969ff16457c help Sebastien Jodogne <s.jodogne@gmail.com> parents: 128 diff changeset	1497 {
1969ff16457c help Sebastien Jodogne <s.jodogne@gmail.com> parents: 128 diff changeset	1498 PrintHelp(argv[0]);
1969ff16457c help Sebastien Jodogne <s.jodogne@gmail.com> parents: 128 diff changeset	1499 return 0;
1969ff16457c help Sebastien Jodogne <s.jodogne@gmail.com> parents: 128 diff changeset	1500 }
1666 d7039be97eeb better command-line options handling Sebastien Jodogne <s.jodogne@gmail.com> parents: 1651 diff changeset	1501 else if (argument == "--version")
133 1969ff16457c help Sebastien Jodogne <s.jodogne@gmail.com> parents: 128 diff changeset	1502 {
1969ff16457c help Sebastien Jodogne <s.jodogne@gmail.com> parents: 128 diff changeset	1503 PrintVersion(argv[0]);
1969ff16457c help Sebastien Jodogne <s.jodogne@gmail.com> parents: 128 diff changeset	1504 return 0;
1969ff16457c help Sebastien Jodogne <s.jodogne@gmail.com> parents: 128 diff changeset	1505 }
1666 d7039be97eeb better command-line options handling Sebastien Jodogne <s.jodogne@gmail.com> parents: 1651 diff changeset	1506 else if (argument == "--verbose")
137 0e97abc7b950 fix of a bug in older versions of sqlite Sebastien Jodogne <s.jodogne@gmail.com> parents: 136 diff changeset	1507 {
1485 27661b33f624 Creation of Logging.h Sebastien Jodogne <s.jodogne@gmail.com> parents: 1455 diff changeset	1508 Logging::EnableInfoLevel(true);
137 0e97abc7b950 fix of a bug in older versions of sqlite Sebastien Jodogne <s.jodogne@gmail.com> parents: 136 diff changeset	1509 }
1666 d7039be97eeb better command-line options handling Sebastien Jodogne <s.jodogne@gmail.com> parents: 1651 diff changeset	1510 else if (argument == "--trace")
137 0e97abc7b950 fix of a bug in older versions of sqlite Sebastien Jodogne <s.jodogne@gmail.com> parents: 136 diff changeset	1511 {
1485 27661b33f624 Creation of Logging.h Sebastien Jodogne <s.jodogne@gmail.com> parents: 1455 diff changeset	1512 Logging::EnableTraceLevel(true);
137 0e97abc7b950 fix of a bug in older versions of sqlite Sebastien Jodogne <s.jodogne@gmail.com> parents: 136 diff changeset	1513 }
1666 d7039be97eeb better command-line options handling Sebastien Jodogne <s.jodogne@gmail.com> parents: 1651 diff changeset	1514 else if (boost::starts_with(argument, "--logdir="))
112 80ca409f232f logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 108 diff changeset	1515 {
2018 300599489cab USE_BOOST_LOCALE_BACKENDS Sebastien Jodogne <s.jodogne@gmail.com> parents: 2015 diff changeset	1516 // TODO WHAT IS THE ENCODING?
1666 d7039be97eeb better command-line options handling Sebastien Jodogne <s.jodogne@gmail.com> parents: 1651 diff changeset	1517 std::string directory = argument.substr(9);
1490 596927722403 support of --logdir by the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1489 diff changeset	1518
596927722403 support of --logdir by the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1489 diff changeset	1519 try
596927722403 support of --logdir by the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1489 diff changeset	1520 {
596927722403 support of --logdir by the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1489 diff changeset	1521 Logging::SetTargetFolder(directory);
596927722403 support of --logdir by the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1489 diff changeset	1522 }
596927722403 support of --logdir by the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1489 diff changeset	1523 catch (OrthancException&)
596927722403 support of --logdir by the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1489 diff changeset	1524 {
1666 d7039be97eeb better command-line options handling Sebastien Jodogne <s.jodogne@gmail.com> parents: 1651 diff changeset	1525 LOG(ERROR) << "The directory where to store the log files ("
d7039be97eeb better command-line options handling Sebastien Jodogne <s.jodogne@gmail.com> parents: 1651 diff changeset	1526 << directory << ") is inexistent, aborting.";
1490 596927722403 support of --logdir by the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1489 diff changeset	1527 return -1;
596927722403 support of --logdir by the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1489 diff changeset	1528 }
112 80ca409f232f logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 108 diff changeset	1529 }
2015 bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2010 diff changeset	1530 else if (boost::starts_with(argument, "--logfile="))
bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2010 diff changeset	1531 {
2018 300599489cab USE_BOOST_LOCALE_BACKENDS Sebastien Jodogne <s.jodogne@gmail.com> parents: 2015 diff changeset	1532 // TODO WHAT IS THE ENCODING?
2015 bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2010 diff changeset	1533 std::string file = argument.substr(10);
bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2010 diff changeset	1534
bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2010 diff changeset	1535 try
bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2010 diff changeset	1536 {
bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2010 diff changeset	1537 Logging::SetTargetFile(file);
bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2010 diff changeset	1538 }
bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2010 diff changeset	1539 catch (OrthancException&)
bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2010 diff changeset	1540 {
bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2010 diff changeset	1541 LOG(ERROR) << "Cannot write to the specified log file ("
bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2010 diff changeset	1542 << file << "), aborting.";
bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2010 diff changeset	1543 return -1;
bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2010 diff changeset	1544 }
bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2010 diff changeset	1545 }
1666 d7039be97eeb better command-line options handling Sebastien Jodogne <s.jodogne@gmail.com> parents: 1651 diff changeset	1546 else if (argument == "--upgrade")
1615 c40fe92a68e7 Primitives to upgrade the database version in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1592 diff changeset	1547 {
2299 03982a0db696 Fix issue #29 (more consistent handling of the "--upgrade" argument) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2295 diff changeset	1548 upgradeDatabase = true;
1615 c40fe92a68e7 Primitives to upgrade the database version in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1592 diff changeset	1549 }
2671 06c0a6b8a871 new command-line argument: --no-jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	1550 else if (argument == "--no-jobs")
06c0a6b8a871 new command-line argument: --no-jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	1551 {
06c0a6b8a871 new command-line argument: --no-jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	1552 loadJobsFromDatabase = false;
06c0a6b8a871 new command-line argument: --no-jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	1553 }
1666 d7039be97eeb better command-line options handling Sebastien Jodogne <s.jodogne@gmail.com> parents: 1651 diff changeset	1554 else if (boost::starts_with(argument, "--config="))
175 662af781a227 sample config file from command line Sebastien Jodogne <s.jodogne@gmail.com> parents: 158 diff changeset	1555 {
2018 300599489cab USE_BOOST_LOCALE_BACKENDS Sebastien Jodogne <s.jodogne@gmail.com> parents: 2015 diff changeset	1556 // TODO WHAT IS THE ENCODING?
175 662af781a227 sample config file from command line Sebastien Jodogne <s.jodogne@gmail.com> parents: 158 diff changeset	1557 std::string configurationSample;
662af781a227 sample config file from command line Sebastien Jodogne <s.jodogne@gmail.com> parents: 158 diff changeset	1558 GetFileResource(configurationSample, EmbeddedResources::CONFIGURATION_SAMPLE);
662af781a227 sample config file from command line Sebastien Jodogne <s.jodogne@gmail.com> parents: 158 diff changeset	1559
684 96d8410c56cd newlines Sebastien Jodogne <s.jodogne@gmail.com> parents: 657 diff changeset	1560 #if defined(_WIN32)
96d8410c56cd newlines Sebastien Jodogne <s.jodogne@gmail.com> parents: 657 diff changeset	1561 // Replace UNIX newlines with DOS newlines
96d8410c56cd newlines Sebastien Jodogne <s.jodogne@gmail.com> parents: 657 diff changeset	1562 boost::replace_all(configurationSample, "\n", "\r\n");
96d8410c56cd newlines Sebastien Jodogne <s.jodogne@gmail.com> parents: 657 diff changeset	1563 #endif
96d8410c56cd newlines Sebastien Jodogne <s.jodogne@gmail.com> parents: 657 diff changeset	1564
1666 d7039be97eeb better command-line options handling Sebastien Jodogne <s.jodogne@gmail.com> parents: 1651 diff changeset	1565 std::string target = argument.substr(9);
2295 5465cab476cf Fix issue #45 (crash when providing a folder to "--config" command-line option) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2268 diff changeset	1566
5465cab476cf Fix issue #45 (crash when providing a folder to "--config" command-line option) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2268 diff changeset	1567 try
5465cab476cf Fix issue #45 (crash when providing a folder to "--config" command-line option) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2268 diff changeset	1568 {
3526 f07352e0375c new configuration option ExecuteLuaEnabled Sebastien Jodogne <s.jodogne@gmail.com> parents: 3506 diff changeset	1569 if (target == "-")
f07352e0375c new configuration option ExecuteLuaEnabled Sebastien Jodogne <s.jodogne@gmail.com> parents: 3506 diff changeset	1570 {
f07352e0375c new configuration option ExecuteLuaEnabled Sebastien Jodogne <s.jodogne@gmail.com> parents: 3506 diff changeset	1571 // New in 1.5.8: Print to stdout
f07352e0375c new configuration option ExecuteLuaEnabled Sebastien Jodogne <s.jodogne@gmail.com> parents: 3506 diff changeset	1572 std::cout << configurationSample;
f07352e0375c new configuration option ExecuteLuaEnabled Sebastien Jodogne <s.jodogne@gmail.com> parents: 3506 diff changeset	1573 }
f07352e0375c new configuration option ExecuteLuaEnabled Sebastien Jodogne <s.jodogne@gmail.com> parents: 3506 diff changeset	1574 else
f07352e0375c new configuration option ExecuteLuaEnabled Sebastien Jodogne <s.jodogne@gmail.com> parents: 3506 diff changeset	1575 {
f07352e0375c new configuration option ExecuteLuaEnabled Sebastien Jodogne <s.jodogne@gmail.com> parents: 3506 diff changeset	1576 SystemToolbox::WriteFile(configurationSample, target);
f07352e0375c new configuration option ExecuteLuaEnabled Sebastien Jodogne <s.jodogne@gmail.com> parents: 3506 diff changeset	1577 }
2295 5465cab476cf Fix issue #45 (crash when providing a folder to "--config" command-line option) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2268 diff changeset	1578 return 0;
5465cab476cf Fix issue #45 (crash when providing a folder to "--config" command-line option) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2268 diff changeset	1579 }
5465cab476cf Fix issue #45 (crash when providing a folder to "--config" command-line option) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2268 diff changeset	1580 catch (OrthancException&)
5465cab476cf Fix issue #45 (crash when providing a folder to "--config" command-line option) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2268 diff changeset	1581 {
5465cab476cf Fix issue #45 (crash when providing a folder to "--config" command-line option) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2268 diff changeset	1582 LOG(ERROR) << "Cannot write sample configuration as file \"" << target << "\"";
5465cab476cf Fix issue #45 (crash when providing a folder to "--config" command-line option) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2268 diff changeset	1583 return -1;
5465cab476cf Fix issue #45 (crash when providing a folder to "--config" command-line option) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2268 diff changeset	1584 }
175 662af781a227 sample config file from command line Sebastien Jodogne <s.jodogne@gmail.com> parents: 158 diff changeset	1585 }
1666 d7039be97eeb better command-line options handling Sebastien Jodogne <s.jodogne@gmail.com> parents: 1651 diff changeset	1586 else
d7039be97eeb better command-line options handling Sebastien Jodogne <s.jodogne@gmail.com> parents: 1651 diff changeset	1587 {
d7039be97eeb better command-line options handling Sebastien Jodogne <s.jodogne@gmail.com> parents: 1651 diff changeset	1588 LOG(WARNING) << "Option unsupported by the core of Orthanc: " << argument;
d7039be97eeb better command-line options handling Sebastien Jodogne <s.jodogne@gmail.com> parents: 1651 diff changeset	1589 }
112 80ca409f232f logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 108 diff changeset	1590 }
80ca409f232f logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 108 diff changeset	1591
1666 d7039be97eeb better command-line options handling Sebastien Jodogne <s.jodogne@gmail.com> parents: 1651 diff changeset	1592
d7039be97eeb better command-line options handling Sebastien Jodogne <s.jodogne@gmail.com> parents: 1651 diff changeset	1593 /**
d7039be97eeb better command-line options handling Sebastien Jodogne <s.jodogne@gmail.com> parents: 1651 diff changeset	1594 * Launch Orthanc.
d7039be97eeb better command-line options handling Sebastien Jodogne <s.jodogne@gmail.com> parents: 1651 diff changeset	1595 **/
1102 ce6386b37afd avoid unnecessary exceptions on Orthanc startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1066 diff changeset	1596
1866 579bf74f7da1 output creation time for mainline builds Sebastien Jodogne <s.jodogne@gmail.com> parents: 1851 diff changeset	1597 {
579bf74f7da1 output creation time for mainline builds Sebastien Jodogne <s.jodogne@gmail.com> parents: 1851 diff changeset	1598 std::string version(ORTHANC_VERSION);
579bf74f7da1 output creation time for mainline builds Sebastien Jodogne <s.jodogne@gmail.com> parents: 1851 diff changeset	1599
579bf74f7da1 output creation time for mainline builds Sebastien Jodogne <s.jodogne@gmail.com> parents: 1851 diff changeset	1600 if (std::string(ORTHANC_VERSION) == "mainline")
579bf74f7da1 output creation time for mainline builds Sebastien Jodogne <s.jodogne@gmail.com> parents: 1851 diff changeset	1601 {
579bf74f7da1 output creation time for mainline builds Sebastien Jodogne <s.jodogne@gmail.com> parents: 1851 diff changeset	1602 try
579bf74f7da1 output creation time for mainline builds Sebastien Jodogne <s.jodogne@gmail.com> parents: 1851 diff changeset	1603 {
2140 aa4b8895cd23 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2136 diff changeset	1604 boost::filesystem::path exe(SystemToolbox::GetPathToExecutable());
1866 579bf74f7da1 output creation time for mainline builds Sebastien Jodogne <s.jodogne@gmail.com> parents: 1851 diff changeset	1605 std::time_t creation = boost::filesystem::last_write_time(exe);
579bf74f7da1 output creation time for mainline builds Sebastien Jodogne <s.jodogne@gmail.com> parents: 1851 diff changeset	1606 boost::posix_time::ptime converted(boost::posix_time::from_time_t(creation));
579bf74f7da1 output creation time for mainline builds Sebastien Jodogne <s.jodogne@gmail.com> parents: 1851 diff changeset	1607 version += " (" + boost::posix_time::to_iso_string(converted) + ")";
579bf74f7da1 output creation time for mainline builds Sebastien Jodogne <s.jodogne@gmail.com> parents: 1851 diff changeset	1608 }
579bf74f7da1 output creation time for mainline builds Sebastien Jodogne <s.jodogne@gmail.com> parents: 1851 diff changeset	1609 catch (...)
579bf74f7da1 output creation time for mainline builds Sebastien Jodogne <s.jodogne@gmail.com> parents: 1851 diff changeset	1610 {
579bf74f7da1 output creation time for mainline builds Sebastien Jodogne <s.jodogne@gmail.com> parents: 1851 diff changeset	1611 }
579bf74f7da1 output creation time for mainline builds Sebastien Jodogne <s.jodogne@gmail.com> parents: 1851 diff changeset	1612 }
579bf74f7da1 output creation time for mainline builds Sebastien Jodogne <s.jodogne@gmail.com> parents: 1851 diff changeset	1613
579bf74f7da1 output creation time for mainline builds Sebastien Jodogne <s.jodogne@gmail.com> parents: 1851 diff changeset	1614 LOG(WARNING) << "Orthanc version: " << version;
2079 acb4cd4af771 Performance warning if runtime debug assertions are turned on Sebastien Jodogne <s.jodogne@gmail.com> parents: 2069 diff changeset	1615 assert(DisplayPerformanceWarning());
1866 579bf74f7da1 output creation time for mainline builds Sebastien Jodogne <s.jodogne@gmail.com> parents: 1851 diff changeset	1616 }
1102 ce6386b37afd avoid unnecessary exceptions on Orthanc startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1066 diff changeset	1617
291 4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 270 diff changeset	1618 int status = 0;
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1619 try
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1620 {
1103 bec1eccf976c Hot restart of Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 1102 diff changeset	1621 for (;;)
270 e6a4c4329481 parameters for storage capacity Sebastien Jodogne <s.jodogne@gmail.com> parents: 236 diff changeset	1622 {
1103 bec1eccf976c Hot restart of Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 1102 diff changeset	1623 OrthancInitialize(configurationFile);
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1624
2671 06c0a6b8a871 new command-line argument: --no-jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	1625 bool restart = StartOrthanc(argc, argv, upgradeDatabase, loadJobsFromDatabase);
1452 b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	1626 if (restart)
23 62bd05fe4b7c support for ssl Sebastien Jodogne <s.jodogne@gmail.com> parents: 19 diff changeset	1627 {
1103 bec1eccf976c Hot restart of Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 1102 diff changeset	1628 OrthancFinalize();
2015 bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2010 diff changeset	1629 LOG(WARNING) << "Logging system is resetting";
bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2010 diff changeset	1630 Logging::Reset();
23 62bd05fe4b7c support for ssl Sebastien Jodogne <s.jodogne@gmail.com> parents: 19 diff changeset	1631 }
62bd05fe4b7c support for ssl Sebastien Jodogne <s.jodogne@gmail.com> parents: 19 diff changeset	1632 else
62bd05fe4b7c support for ssl Sebastien Jodogne <s.jodogne@gmail.com> parents: 19 diff changeset	1633 {
1103 bec1eccf976c Hot restart of Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 1102 diff changeset	1634 break;
23 62bd05fe4b7c support for ssl Sebastien Jodogne <s.jodogne@gmail.com> parents: 19 diff changeset	1635 }
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1636 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1637 }
1245 aea9277dee75 catch more exceptions (patch from Valdas Rapsevicius) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1232 diff changeset	1638 catch (const OrthancException& e)
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1639 {
1733 e1f5ab395297 PrintErrors Sebastien Jodogne <s.jodogne@gmail.com> parents: 1730 diff changeset	1640 LOG(ERROR) << "Uncaught exception, stopping now: [" << e.What() << "] (code " << e.GetErrorCode() << ")";
e1f5ab395297 PrintErrors Sebastien Jodogne <s.jodogne@gmail.com> parents: 1730 diff changeset	1641 #if defined(_WIN32)
1734 e2675b37eb01 Under Windows, the exit status of Orthanc corresponds to the encountered error code Sebastien Jodogne <s.jodogne@gmail.com> parents: 1733 diff changeset	1642 if (e.GetErrorCode() >= ErrorCode_START_PLUGINS)
e2675b37eb01 Under Windows, the exit status of Orthanc corresponds to the encountered error code Sebastien Jodogne <s.jodogne@gmail.com> parents: 1733 diff changeset	1643 {
e2675b37eb01 Under Windows, the exit status of Orthanc corresponds to the encountered error code Sebastien Jodogne <s.jodogne@gmail.com> parents: 1733 diff changeset	1644 status = static_cast<int>(ErrorCode_Plugin);
e2675b37eb01 Under Windows, the exit status of Orthanc corresponds to the encountered error code Sebastien Jodogne <s.jodogne@gmail.com> parents: 1733 diff changeset	1645 }
e2675b37eb01 Under Windows, the exit status of Orthanc corresponds to the encountered error code Sebastien Jodogne <s.jodogne@gmail.com> parents: 1733 diff changeset	1646 else
e2675b37eb01 Under Windows, the exit status of Orthanc corresponds to the encountered error code Sebastien Jodogne <s.jodogne@gmail.com> parents: 1733 diff changeset	1647 {
e2675b37eb01 Under Windows, the exit status of Orthanc corresponds to the encountered error code Sebastien Jodogne <s.jodogne@gmail.com> parents: 1733 diff changeset	1648 status = static_cast<int>(e.GetErrorCode());
e2675b37eb01 Under Windows, the exit status of Orthanc corresponds to the encountered error code Sebastien Jodogne <s.jodogne@gmail.com> parents: 1733 diff changeset	1649 }
e2675b37eb01 Under Windows, the exit status of Orthanc corresponds to the encountered error code Sebastien Jodogne <s.jodogne@gmail.com> parents: 1733 diff changeset	1650
1733 e1f5ab395297 PrintErrors Sebastien Jodogne <s.jodogne@gmail.com> parents: 1730 diff changeset	1651 #else
291 4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 270 diff changeset	1652 status = -1;
1733 e1f5ab395297 PrintErrors Sebastien Jodogne <s.jodogne@gmail.com> parents: 1730 diff changeset	1653 #endif
291 4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 270 diff changeset	1654 }
1245 aea9277dee75 catch more exceptions (patch from Valdas Rapsevicius) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1232 diff changeset	1655 catch (const std::exception& e)
aea9277dee75 catch more exceptions (patch from Valdas Rapsevicius) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1232 diff changeset	1656 {
aea9277dee75 catch more exceptions (patch from Valdas Rapsevicius) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1232 diff changeset	1657 LOG(ERROR) << "Uncaught exception, stopping now: [" << e.what() << "]";
aea9277dee75 catch more exceptions (patch from Valdas Rapsevicius) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1232 diff changeset	1658 status = -1;
aea9277dee75 catch more exceptions (patch from Valdas Rapsevicius) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1232 diff changeset	1659 }
aea9277dee75 catch more exceptions (patch from Valdas Rapsevicius) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1232 diff changeset	1660 catch (const std::string& s)
aea9277dee75 catch more exceptions (patch from Valdas Rapsevicius) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1232 diff changeset	1661 {
aea9277dee75 catch more exceptions (patch from Valdas Rapsevicius) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1232 diff changeset	1662 LOG(ERROR) << "Uncaught exception, stopping now: [" << s << "]";
aea9277dee75 catch more exceptions (patch from Valdas Rapsevicius) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1232 diff changeset	1663 status = -1;
aea9277dee75 catch more exceptions (patch from Valdas Rapsevicius) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1232 diff changeset	1664 }
291 4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 270 diff changeset	1665 catch (...)
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 270 diff changeset	1666 {
1223 5bd4c9f85b4c fix race condition while unregistering plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1210 diff changeset	1667 LOG(ERROR) << "Native exception, stopping now. Check your plugins, if any.";
291 4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 270 diff changeset	1668 status = -1;
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1669 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1670
62 a70bb32802ae renaming Server Sebastien Jodogne <s.jodogne@gmail.com> parents: 57 diff changeset	1671 OrthancFinalize();
27 cfe212a513c5 openssl with visual studio Administrator@jodogne-w01 parents: 26 diff changeset	1672
690 2e67366aab83 case-insensitive matching of Application Entity Titles Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	1673 LOG(WARNING) << "Orthanc has stopped";
2e67366aab83 case-insensitive matching of Application Entity Titles Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	1674
1485 27661b33f624 Creation of Logging.h Sebastien Jodogne <s.jodogne@gmail.com> parents: 1455 diff changeset	1675 Logging::Finalize();
27661b33f624 Creation of Logging.h Sebastien Jodogne <s.jodogne@gmail.com> parents: 1455 diff changeset	1676
291 4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 270 diff changeset	1677 return status;
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1678 }

Mercurial > hg > orthanc

annotate OrthancServer/main.cpp @ 3820:f89eac983c9b transcoding