orthanc: OrthancServer/main.cpp annotate

annotate OrthancServer/main.cpp @ 1443:895ab369d63c

refactoring: OrthancHttpHandler

author	Sebastien Jodogne <s.jodogne@gmail.com>
date	Wed, 01 Jul 2015 11:30:19 +0200
parents	02f5a3f5c0a0
children	b2b09a3dbd8e

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
1288 6e7e5ed91c2d upgrade to year 2015 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1285 diff changeset	3 * Copyright (C) 2012-2015 Sebastien Jodogne, Medical Physics
6e7e5ed91c2d upgrade to year 2015 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1285 diff changeset	4 * Department, University Hospital of Liege, Belgium
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	5 *
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	6 * This program is free software: you can redistribute it and/or
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	7 * modify it under the terms of the GNU General Public License as
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	8 * published by the Free Software Foundation, either version 3 of the
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	9 * License, or (at your option) any later version.
136 fe180eae201d openssl exception Sebastien Jodogne <s.jodogne@gmail.com> parents: 133 diff changeset	10 *
fe180eae201d openssl exception Sebastien Jodogne <s.jodogne@gmail.com> parents: 133 diff changeset	11 * In addition, as a special exception, the copyright holders of this
fe180eae201d openssl exception Sebastien Jodogne <s.jodogne@gmail.com> parents: 133 diff changeset	12 * 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	13 * OpenSSL project's "OpenSSL" library (or with modified versions of it
fe180eae201d openssl exception Sebastien Jodogne <s.jodogne@gmail.com> parents: 133 diff changeset	14 * that use the same license as the "OpenSSL" library), and distribute
fe180eae201d openssl exception Sebastien Jodogne <s.jodogne@gmail.com> parents: 133 diff changeset	15 * the linked executables. You must obey the GNU General Public License
fe180eae201d openssl exception Sebastien Jodogne <s.jodogne@gmail.com> parents: 133 diff changeset	16 * 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	17 * 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	18 * 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	19 * 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	20 * version. If you delete this exception statement from all source files
fe180eae201d openssl exception Sebastien Jodogne <s.jodogne@gmail.com> parents: 133 diff changeset	21 * in the program, then also delete it here.
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	22 *
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	23 * 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	24 * WITHOUT ANY WARRANTY; without even the implied warranty of
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	25 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	26 * General Public License for more details.
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	27 *
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	28 * You should have received a copy of the GNU General Public License
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	29 * along with this program. If not, see <http://www.gnu.org/licenses/>.
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	30 **/
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
831 84513f2ee1f3 pch for unit tests and server Sebastien Jodogne <s.jodogne@gmail.com> parents: 824 diff changeset	33 #include "PrecompiledHeadersServer.h"
750 4afad8cb94fd moves Sebastien Jodogne <s.jodogne@gmail.com> parents: 730 diff changeset	34 #include "OrthancRestApi/OrthancRestApi.h"
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	35
175 662af781a227 sample config file from command line Sebastien Jodogne <s.jodogne@gmail.com> parents: 158 diff changeset	36 #include <fstream>
102 7593b57dc1bf switch to google log Sebastien Jodogne <s.jodogne@gmail.com> parents: 62 diff changeset	37 #include <glog/logging.h>
112 80ca409f232f logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 108 diff changeset	38 #include <boost/algorithm/string/predicate.hpp>
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	39
1127 f4e65808ea58 FilesystemStorageWithoutDicom Sebastien Jodogne <s.jodogne@gmail.com> parents: 1124 diff changeset	40 #include "../Core/Uuid.h"
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	41 #include "../Core/HttpServer/EmbeddedResourceHttpHandler.h"
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	42 #include "../Core/HttpServer/FilesystemHttpHandler.h"
388 466c992a9a42 testing filters inside orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 376 diff changeset	43 #include "../Core/Lua/LuaFunctionCall.h"
387 ff647eedfbe1 enabling of Find/Move commands Sebastien Jodogne <s.jodogne@gmail.com> parents: 376 diff changeset	44 #include "../Core/DicomFormat/DicomArray.h"
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	45 #include "DicomProtocol/DicomServer.h"
774 4e3593c3511d NEWS Sebastien Jodogne <s.jodogne@gmail.com> parents: 750 diff changeset	46 #include "DicomProtocol/ReusableDicomUserConnection.h"
62 a70bb32802ae renaming Server Sebastien Jodogne <s.jodogne@gmail.com> parents: 57 diff changeset	47 #include "OrthancInitialization.h"
224 4eb0c7ce86c9 refactoring for store Sebastien Jodogne <s.jodogne@gmail.com> parents: 210 diff changeset	48 #include "ServerContext.h"
565 c931ac02db82 refactoring of find class Sebastien Jodogne <s.jodogne@gmail.com> parents: 559 diff changeset	49 #include "OrthancFindRequestHandler.h"
619 70d0f27e5bd3 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 618 diff changeset	50 #include "OrthancMoveRequestHandler.h"
730 309e686b41e7 better logging about nonexistent tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 725 diff changeset	51 #include "ServerToolbox.h"
1132 f739d3f6cfcf rename Sebastien Jodogne <s.jodogne@gmail.com> parents: 1127 diff changeset	52 #include "../Plugins/Engine/OrthancPlugins.h"
1366 a3559b66fba7 move primitives Sebastien Jodogne <s.jodogne@gmail.com> parents: 1364 diff changeset	53 #include "FromDcmtkBridge.h"
1443 895ab369d63c refactoring: OrthancHttpHandler Sebastien Jodogne <s.jodogne@gmail.com> parents: 1437 diff changeset	54 #include "OrthancHttpHandler.h"
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	55
62 a70bb32802ae renaming Server Sebastien Jodogne <s.jodogne@gmail.com> parents: 57 diff changeset	56 using namespace Orthanc;
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	57
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	58
1193 e95e7f9eba96 fix crash when stopping Orthanc during a DICOM connection Sebastien Jodogne <s.jodogne@gmail.com> parents: 1171 diff changeset	59 #define ENABLE_PLUGINS 1
e95e7f9eba96 fix crash when stopping Orthanc during a DICOM connection Sebastien Jodogne <s.jodogne@gmail.com> parents: 1171 diff changeset	60
224 4eb0c7ce86c9 refactoring for store Sebastien Jodogne <s.jodogne@gmail.com> parents: 210 diff changeset	61
613 60d90e48e809 query/retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 565 diff changeset	62 class OrthancStoreRequestHandler : public IStoreRequestHandler
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	63 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	64 private:
388 466c992a9a42 testing filters inside orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 376 diff changeset	65 ServerContext& server_;
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	66
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	67 public:
613 60d90e48e809 query/retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 565 diff changeset	68 OrthancStoreRequestHandler(ServerContext& context) :
388 466c992a9a42 testing filters inside orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 376 diff changeset	69 server_(context)
0 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 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: 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,
1285 5730f374e4e6 Access to called AET and remote AET from Lua scripts Sebastien Jodogne <s.jodogne@gmail.com> parents: 1280 diff changeset	76 const std::string& remoteAet,
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& calledAet)
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	78 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	79 if (dicomFile.size() > 0)
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	80 {
1005 84b6d7bca6db refactoring of ServerContext::Store Sebastien Jodogne <s.jodogne@gmail.com> parents: 996 diff changeset	81 DicomInstanceToStore toStore;
84b6d7bca6db refactoring of ServerContext::Store Sebastien Jodogne <s.jodogne@gmail.com> parents: 996 diff changeset	82 toStore.SetBuffer(dicomFile);
84b6d7bca6db refactoring of ServerContext::Store Sebastien Jodogne <s.jodogne@gmail.com> parents: 996 diff changeset	83 toStore.SetSummary(dicomSummary);
84b6d7bca6db refactoring of ServerContext::Store Sebastien Jodogne <s.jodogne@gmail.com> parents: 996 diff changeset	84 toStore.SetJson(dicomJson);
84b6d7bca6db refactoring of ServerContext::Store Sebastien Jodogne <s.jodogne@gmail.com> parents: 996 diff changeset	85 toStore.SetRemoteAet(remoteAet);
1285 5730f374e4e6 Access to called AET and remote AET from Lua scripts Sebastien Jodogne <s.jodogne@gmail.com> parents: 1280 diff changeset	86 toStore.SetCalledAet(calledAet);
1005 84b6d7bca6db refactoring of ServerContext::Store Sebastien Jodogne <s.jodogne@gmail.com> parents: 996 diff changeset	87
84b6d7bca6db refactoring of ServerContext::Store Sebastien Jodogne <s.jodogne@gmail.com> parents: 996 diff changeset	88 std::string id;
84b6d7bca6db refactoring of ServerContext::Store Sebastien Jodogne <s.jodogne@gmail.com> parents: 996 diff changeset	89 server_.Store(id, toStore);
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	90 }
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
613 60d90e48e809 query/retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 565 diff changeset	95
387 ff647eedfbe1 enabling of Find/Move commands Sebastien Jodogne <s.jodogne@gmail.com> parents: 376 diff changeset	96 class MyDicomServerFactory :
ff647eedfbe1 enabling of Find/Move commands Sebastien Jodogne <s.jodogne@gmail.com> parents: 376 diff changeset	97 public IStoreRequestHandlerFactory,
ff647eedfbe1 enabling of Find/Move commands Sebastien Jodogne <s.jodogne@gmail.com> parents: 376 diff changeset	98 public IFindRequestHandlerFactory,
ff647eedfbe1 enabling of Find/Move commands Sebastien Jodogne <s.jodogne@gmail.com> parents: 376 diff changeset	99 public IMoveRequestHandlerFactory
ff647eedfbe1 enabling of Find/Move commands Sebastien Jodogne <s.jodogne@gmail.com> parents: 376 diff changeset	100 {
ff647eedfbe1 enabling of Find/Move commands Sebastien Jodogne <s.jodogne@gmail.com> parents: 376 diff changeset	101 private:
ff647eedfbe1 enabling of Find/Move commands Sebastien Jodogne <s.jodogne@gmail.com> parents: 376 diff changeset	102 ServerContext& context_;
ff647eedfbe1 enabling of Find/Move commands Sebastien Jodogne <s.jodogne@gmail.com> parents: 376 diff changeset	103
ff647eedfbe1 enabling of Find/Move commands Sebastien Jodogne <s.jodogne@gmail.com> parents: 376 diff changeset	104 public:
ff647eedfbe1 enabling of Find/Move commands Sebastien Jodogne <s.jodogne@gmail.com> parents: 376 diff changeset	105 MyDicomServerFactory(ServerContext& context) : context_(context)
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	106 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	107 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	108
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	109 virtual IStoreRequestHandler* ConstructStoreRequestHandler()
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	110 {
613 60d90e48e809 query/retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 565 diff changeset	111 return new OrthancStoreRequestHandler(context_);
387 ff647eedfbe1 enabling of Find/Move commands Sebastien Jodogne <s.jodogne@gmail.com> parents: 376 diff changeset	112 }
ff647eedfbe1 enabling of Find/Move commands Sebastien Jodogne <s.jodogne@gmail.com> parents: 376 diff changeset	113
ff647eedfbe1 enabling of Find/Move commands Sebastien Jodogne <s.jodogne@gmail.com> parents: 376 diff changeset	114 virtual IFindRequestHandler* ConstructFindRequestHandler()
ff647eedfbe1 enabling of Find/Move commands Sebastien Jodogne <s.jodogne@gmail.com> parents: 376 diff changeset	115 {
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	116 std::auto_ptr<OrthancFindRequestHandler> result(new OrthancFindRequestHandler(context_));
83489fddd8c5 Options to limit the number of results for an incoming C-FIND query Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	117
83489fddd8c5 Options to limit the number of results for an incoming C-FIND query Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	118 result->SetMaxResults(Configuration::GetGlobalIntegerParameter("LimitFindResults", 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	119 result->SetMaxInstances(Configuration::GetGlobalIntegerParameter("LimitFindInstances", 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	120
83489fddd8c5 Options to limit the number of results for an incoming C-FIND query Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	121 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	122 {
83489fddd8c5 Options to limit the number of results for an incoming C-FIND query Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	123 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	124 }
83489fddd8c5 Options to limit the number of results for an incoming C-FIND query Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	125 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	126 {
83489fddd8c5 Options to limit the number of results for an incoming C-FIND query Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	127 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	128 << " 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	129 }
83489fddd8c5 Options to limit the number of results for an incoming C-FIND query Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	130
83489fddd8c5 Options to limit the number of results for an incoming C-FIND query Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	131 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	132 {
83489fddd8c5 Options to limit the number of results for an incoming C-FIND query Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	133 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	134 }
83489fddd8c5 Options to limit the number of results for an incoming C-FIND query Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	135 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	136 {
83489fddd8c5 Options to limit the number of results for an incoming C-FIND query Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	137 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	138 << " 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	139 }
83489fddd8c5 Options to limit the number of results for an incoming C-FIND query Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	140
83489fddd8c5 Options to limit the number of results for an incoming C-FIND query Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	141 return result.release();
387 ff647eedfbe1 enabling of Find/Move commands Sebastien Jodogne <s.jodogne@gmail.com> parents: 376 diff changeset	142 }
ff647eedfbe1 enabling of Find/Move commands Sebastien Jodogne <s.jodogne@gmail.com> parents: 376 diff changeset	143
ff647eedfbe1 enabling of Find/Move commands Sebastien Jodogne <s.jodogne@gmail.com> parents: 376 diff changeset	144 virtual IMoveRequestHandler* ConstructMoveRequestHandler()
ff647eedfbe1 enabling of Find/Move commands Sebastien Jodogne <s.jodogne@gmail.com> parents: 376 diff changeset	145 {
613 60d90e48e809 query/retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 565 diff changeset	146 return new OrthancMoveRequestHandler(context_);
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	147 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	148
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	149 void Done()
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	150 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	151 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	152 };
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	153
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	154
618 5ab377df6d8b filtering on aet Sebastien Jodogne <s.jodogne@gmail.com> parents: 614 diff changeset	155 class OrthancApplicationEntityFilter : public IApplicationEntityFilter
5ab377df6d8b filtering on aet Sebastien Jodogne <s.jodogne@gmail.com> parents: 614 diff changeset	156 {
1164 0a55d8eb194e Configuration/Lua to select the accepted C-Store SCP transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1163 diff changeset	157 private:
0a55d8eb194e Configuration/Lua to select the accepted C-Store SCP transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1163 diff changeset	158 ServerContext& context_;
0a55d8eb194e Configuration/Lua to select the accepted C-Store SCP transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1163 diff changeset	159
618 5ab377df6d8b filtering on aet Sebastien Jodogne <s.jodogne@gmail.com> parents: 614 diff changeset	160 public:
1164 0a55d8eb194e Configuration/Lua to select the accepted C-Store SCP transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1163 diff changeset	161 OrthancApplicationEntityFilter(ServerContext& context) : context_(context)
0a55d8eb194e Configuration/Lua to select the accepted C-Store SCP transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1163 diff changeset	162 {
0a55d8eb194e Configuration/Lua to select the accepted C-Store SCP transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1163 diff changeset	163 }
0a55d8eb194e Configuration/Lua to select the accepted C-Store SCP transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1163 diff changeset	164
620 4aa6f0d79947 security filter for dicom requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 619 diff changeset	165 virtual bool IsAllowedConnection(const std::string& /callingIp/,
4aa6f0d79947 security filter for dicom requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 619 diff changeset	166 const std::string& /callingAet/)
618 5ab377df6d8b filtering on aet Sebastien Jodogne <s.jodogne@gmail.com> parents: 614 diff changeset	167 {
620 4aa6f0d79947 security filter for dicom requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 619 diff changeset	168 return true;
4aa6f0d79947 security filter for dicom requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 619 diff changeset	169 }
4aa6f0d79947 security filter for dicom requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 619 diff changeset	170
4aa6f0d79947 security filter for dicom requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 619 diff changeset	171 virtual bool IsAllowedRequest(const std::string& /callingIp/,
4aa6f0d79947 security filter for dicom requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 619 diff changeset	172 const std::string& callingAet,
4aa6f0d79947 security filter for dicom requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 619 diff changeset	173 DicomRequestType type)
4aa6f0d79947 security filter for dicom requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 619 diff changeset	174 {
4aa6f0d79947 security filter for dicom requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 619 diff changeset	175 if (type == DicomRequestType_Store)
4aa6f0d79947 security filter for dicom requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 619 diff changeset	176 {
4aa6f0d79947 security filter for dicom requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 619 diff changeset	177 // Incoming store requests are always accepted, even from unknown AET
4aa6f0d79947 security filter for dicom requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 619 diff changeset	178 return true;
4aa6f0d79947 security filter for dicom requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 619 diff changeset	179 }
4aa6f0d79947 security filter for dicom requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 619 diff changeset	180
810 401a9633e492 configuration into a namespace Sebastien Jodogne <s.jodogne@gmail.com> parents: 774 diff changeset	181 if (!Configuration::IsKnownAETitle(callingAet))
618 5ab377df6d8b filtering on aet Sebastien Jodogne <s.jodogne@gmail.com> parents: 614 diff changeset	182 {
725 ef4569ae7952 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 695 diff changeset	183 LOG(ERROR) << "Unknown remote DICOM modality AET: \"" << callingAet << "\"";
618 5ab377df6d8b filtering on aet Sebastien Jodogne <s.jodogne@gmail.com> parents: 614 diff changeset	184 return false;
5ab377df6d8b filtering on aet Sebastien Jodogne <s.jodogne@gmail.com> parents: 614 diff changeset	185 }
5ab377df6d8b filtering on aet Sebastien Jodogne <s.jodogne@gmail.com> parents: 614 diff changeset	186 else
5ab377df6d8b filtering on aet Sebastien Jodogne <s.jodogne@gmail.com> parents: 614 diff changeset	187 {
5ab377df6d8b filtering on aet Sebastien Jodogne <s.jodogne@gmail.com> parents: 614 diff changeset	188 return true;
5ab377df6d8b filtering on aet Sebastien Jodogne <s.jodogne@gmail.com> parents: 614 diff changeset	189 }
5ab377df6d8b filtering on aet Sebastien Jodogne <s.jodogne@gmail.com> parents: 614 diff changeset	190 }
1163 3db41779d8f9 abstraction to allow/prevent transfer syntaxes on AET basis Sebastien Jodogne <s.jodogne@gmail.com> parents: 1135 diff changeset	191
1164 0a55d8eb194e Configuration/Lua to select the accepted C-Store SCP transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1163 diff changeset	192 virtual bool IsAllowedTransferSyntax(const std::string& callingIp,
0a55d8eb194e Configuration/Lua to select the accepted C-Store SCP transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1163 diff changeset	193 const std::string& callingAet,
1163 3db41779d8f9 abstraction to allow/prevent transfer syntaxes on AET basis Sebastien Jodogne <s.jodogne@gmail.com> parents: 1135 diff changeset	194 TransferSyntax syntax)
3db41779d8f9 abstraction to allow/prevent transfer syntaxes on AET basis Sebastien Jodogne <s.jodogne@gmail.com> parents: 1135 diff changeset	195 {
1164 0a55d8eb194e Configuration/Lua to select the accepted C-Store SCP transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1163 diff changeset	196 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	197
0a55d8eb194e Configuration/Lua to select the accepted C-Store SCP transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1163 diff changeset	198 switch (syntax)
0a55d8eb194e Configuration/Lua to select the accepted C-Store SCP transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1163 diff changeset	199 {
0a55d8eb194e Configuration/Lua to select the accepted C-Store SCP transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1163 diff changeset	200 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	201 configuration = "DeflatedTransferSyntaxAccepted";
0a55d8eb194e Configuration/Lua to select the accepted C-Store SCP transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1163 diff changeset	202 break;
0a55d8eb194e Configuration/Lua to select the accepted C-Store SCP transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1163 diff changeset	203
0a55d8eb194e Configuration/Lua to select the accepted C-Store SCP transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1163 diff changeset	204 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	205 configuration = "JpegTransferSyntaxAccepted";
0a55d8eb194e Configuration/Lua to select the accepted C-Store SCP transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1163 diff changeset	206 break;
0a55d8eb194e Configuration/Lua to select the accepted C-Store SCP transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1163 diff changeset	207
0a55d8eb194e Configuration/Lua to select the accepted C-Store SCP transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1163 diff changeset	208 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	209 configuration = "Jpeg2000TransferSyntaxAccepted";
0a55d8eb194e Configuration/Lua to select the accepted C-Store SCP transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1163 diff changeset	210 break;
0a55d8eb194e Configuration/Lua to select the accepted C-Store SCP transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1163 diff changeset	211
0a55d8eb194e Configuration/Lua to select the accepted C-Store SCP transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1163 diff changeset	212 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	213 configuration = "JpegLosslessTransferSyntaxAccepted";
0a55d8eb194e Configuration/Lua to select the accepted C-Store SCP transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1163 diff changeset	214 break;
0a55d8eb194e Configuration/Lua to select the accepted C-Store SCP transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1163 diff changeset	215
0a55d8eb194e Configuration/Lua to select the accepted C-Store SCP transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1163 diff changeset	216 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	217 configuration = "JpipTransferSyntaxAccepted";
0a55d8eb194e Configuration/Lua to select the accepted C-Store SCP transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1163 diff changeset	218 break;
0a55d8eb194e Configuration/Lua to select the accepted C-Store SCP transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1163 diff changeset	219
0a55d8eb194e Configuration/Lua to select the accepted C-Store SCP transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1163 diff changeset	220 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	221 configuration = "Mpeg2TransferSyntaxAccepted";
0a55d8eb194e Configuration/Lua to select the accepted C-Store SCP transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1163 diff changeset	222 break;
0a55d8eb194e Configuration/Lua to select the accepted C-Store SCP transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1163 diff changeset	223
0a55d8eb194e Configuration/Lua to select the accepted C-Store SCP transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1163 diff changeset	224 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	225 configuration = "RleTransferSyntaxAccepted";
0a55d8eb194e Configuration/Lua to select the accepted C-Store SCP transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1163 diff changeset	226 break;
0a55d8eb194e Configuration/Lua to select the accepted C-Store SCP transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1163 diff changeset	227
0a55d8eb194e Configuration/Lua to select the accepted C-Store SCP transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1163 diff changeset	228 default:
0a55d8eb194e Configuration/Lua to select the accepted C-Store SCP transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1163 diff changeset	229 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	230 }
0a55d8eb194e Configuration/Lua to select the accepted C-Store SCP transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1163 diff changeset	231
0a55d8eb194e Configuration/Lua to select the accepted C-Store SCP transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1163 diff changeset	232 {
0a55d8eb194e Configuration/Lua to select the accepted C-Store SCP transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1163 diff changeset	233 std::string lua = "Is" + configuration;
0a55d8eb194e Configuration/Lua to select the accepted C-Store SCP transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1163 diff changeset	234
1433 461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	235 LuaScripting::Locker locker(context_.GetLua());
1164 0a55d8eb194e Configuration/Lua to select the accepted C-Store SCP transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1163 diff changeset	236
0a55d8eb194e Configuration/Lua to select the accepted C-Store SCP transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1163 diff changeset	237 if (locker.GetLua().IsExistingFunction(lua.c_str()))
0a55d8eb194e Configuration/Lua to select the accepted C-Store SCP transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1163 diff changeset	238 {
0a55d8eb194e Configuration/Lua to select the accepted C-Store SCP transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1163 diff changeset	239 LuaFunctionCall call(locker.GetLua(), lua.c_str());
0a55d8eb194e Configuration/Lua to select the accepted C-Store SCP transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1163 diff changeset	240 call.PushString(callingAet);
0a55d8eb194e Configuration/Lua to select the accepted C-Store SCP transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1163 diff changeset	241 call.PushString(callingIp);
0a55d8eb194e Configuration/Lua to select the accepted C-Store SCP transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1163 diff changeset	242 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	243 }
0a55d8eb194e Configuration/Lua to select the accepted C-Store SCP transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1163 diff changeset	244 }
0a55d8eb194e Configuration/Lua to select the accepted C-Store SCP transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1163 diff changeset	245
0a55d8eb194e Configuration/Lua to select the accepted C-Store SCP transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1163 diff changeset	246 return Configuration::GetGlobalBoolParameter(configuration, true);
1163 3db41779d8f9 abstraction to allow/prevent transfer syntaxes on AET basis Sebastien Jodogne <s.jodogne@gmail.com> parents: 1135 diff changeset	247 }
618 5ab377df6d8b filtering on aet Sebastien Jodogne <s.jodogne@gmail.com> parents: 614 diff changeset	248 };
5ab377df6d8b filtering on aet Sebastien Jodogne <s.jodogne@gmail.com> parents: 614 diff changeset	249
5ab377df6d8b filtering on aet Sebastien Jodogne <s.jodogne@gmail.com> parents: 614 diff changeset	250
409 63f707278fc8 lua filtering of incoming http requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 407 diff changeset	251 class MyIncomingHttpRequestFilter : public IIncomingHttpRequestFilter
63f707278fc8 lua filtering of incoming http requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 407 diff changeset	252 {
63f707278fc8 lua filtering of incoming http requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 407 diff changeset	253 private:
63f707278fc8 lua filtering of incoming http requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 407 diff changeset	254 ServerContext& context_;
63f707278fc8 lua filtering of incoming http requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 407 diff changeset	255
63f707278fc8 lua filtering of incoming http requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 407 diff changeset	256 public:
63f707278fc8 lua filtering of incoming http requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 407 diff changeset	257 MyIncomingHttpRequestFilter(ServerContext& context) : context_(context)
63f707278fc8 lua filtering of incoming http requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 407 diff changeset	258 {
63f707278fc8 lua filtering of incoming http requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 407 diff changeset	259 }
63f707278fc8 lua filtering of incoming http requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 407 diff changeset	260
473 c9a5d72f8481 changing the namespace of HTTP enumerations Sebastien Jodogne <s.jodogne@gmail.com> parents: 426 diff changeset	261 virtual bool IsAllowed(HttpMethod method,
409 63f707278fc8 lua filtering of incoming http requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 407 diff changeset	262 const char* uri,
63f707278fc8 lua filtering of incoming http requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 407 diff changeset	263 const char* ip,
63f707278fc8 lua filtering of incoming http requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 407 diff changeset	264 const char* username) const
63f707278fc8 lua filtering of incoming http requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 407 diff changeset	265 {
63f707278fc8 lua filtering of incoming http requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 407 diff changeset	266 static const char* HTTP_FILTER = "IncomingHttpRequestFilter";
63f707278fc8 lua filtering of incoming http requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 407 diff changeset	267
1433 461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	268 LuaScripting::Locker locker(context_.GetLua());
996 cf52f3bcb2b3 clarification of Lua classes wrt multithreading Sebastien Jodogne <s.jodogne@gmail.com> parents: 941 diff changeset	269
409 63f707278fc8 lua filtering of incoming http requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 407 diff changeset	270 // Test if the instance must be filtered out
996 cf52f3bcb2b3 clarification of Lua classes wrt multithreading Sebastien Jodogne <s.jodogne@gmail.com> parents: 941 diff changeset	271 if (locker.GetLua().IsExistingFunction(HTTP_FILTER))
409 63f707278fc8 lua filtering of incoming http requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 407 diff changeset	272 {
996 cf52f3bcb2b3 clarification of Lua classes wrt multithreading Sebastien Jodogne <s.jodogne@gmail.com> parents: 941 diff changeset	273 LuaFunctionCall call(locker.GetLua(), HTTP_FILTER);
409 63f707278fc8 lua filtering of incoming http requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 407 diff changeset	274
63f707278fc8 lua filtering of incoming http requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 407 diff changeset	275 switch (method)
63f707278fc8 lua filtering of incoming http requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 407 diff changeset	276 {
473 c9a5d72f8481 changing the namespace of HTTP enumerations Sebastien Jodogne <s.jodogne@gmail.com> parents: 426 diff changeset	277 case HttpMethod_Get:
409 63f707278fc8 lua filtering of incoming http requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 407 diff changeset	278 call.PushString("GET");
63f707278fc8 lua filtering of incoming http requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 407 diff changeset	279 break;
63f707278fc8 lua filtering of incoming http requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 407 diff changeset	280
473 c9a5d72f8481 changing the namespace of HTTP enumerations Sebastien Jodogne <s.jodogne@gmail.com> parents: 426 diff changeset	281 case HttpMethod_Put:
409 63f707278fc8 lua filtering of incoming http requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 407 diff changeset	282 call.PushString("PUT");
63f707278fc8 lua filtering of incoming http requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 407 diff changeset	283 break;
63f707278fc8 lua filtering of incoming http requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 407 diff changeset	284
473 c9a5d72f8481 changing the namespace of HTTP enumerations Sebastien Jodogne <s.jodogne@gmail.com> parents: 426 diff changeset	285 case HttpMethod_Post:
409 63f707278fc8 lua filtering of incoming http requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 407 diff changeset	286 call.PushString("POST");
63f707278fc8 lua filtering of incoming http requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 407 diff changeset	287 break;
63f707278fc8 lua filtering of incoming http requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 407 diff changeset	288
473 c9a5d72f8481 changing the namespace of HTTP enumerations Sebastien Jodogne <s.jodogne@gmail.com> parents: 426 diff changeset	289 case HttpMethod_Delete:
409 63f707278fc8 lua filtering of incoming http requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 407 diff changeset	290 call.PushString("DELETE");
63f707278fc8 lua filtering of incoming http requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 407 diff changeset	291 break;
63f707278fc8 lua filtering of incoming http requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 407 diff changeset	292
63f707278fc8 lua filtering of incoming http requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 407 diff changeset	293 default:
63f707278fc8 lua filtering of incoming http requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 407 diff changeset	294 return true;
63f707278fc8 lua filtering of incoming http requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 407 diff changeset	295 }
63f707278fc8 lua filtering of incoming http requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 407 diff changeset	296
63f707278fc8 lua filtering of incoming http requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 407 diff changeset	297 call.PushString(uri);
63f707278fc8 lua filtering of incoming http requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 407 diff changeset	298 call.PushString(ip);
63f707278fc8 lua filtering of incoming http requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 407 diff changeset	299 call.PushString(username);
63f707278fc8 lua filtering of incoming http requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 407 diff changeset	300
63f707278fc8 lua filtering of incoming http requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 407 diff changeset	301 if (!call.ExecutePredicate())
63f707278fc8 lua filtering of incoming http requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 407 diff changeset	302 {
63f707278fc8 lua filtering of incoming http requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 407 diff changeset	303 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	304 return false;
63f707278fc8 lua filtering of incoming http requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 407 diff changeset	305 }
63f707278fc8 lua filtering of incoming http requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 407 diff changeset	306 }
63f707278fc8 lua filtering of incoming http requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 407 diff changeset	307
63f707278fc8 lua filtering of incoming http requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 407 diff changeset	308 return true;
63f707278fc8 lua filtering of incoming http requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 407 diff changeset	309 }
63f707278fc8 lua filtering of incoming http requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 407 diff changeset	310 };
63f707278fc8 lua filtering of incoming http requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 407 diff changeset	311
63f707278fc8 lua filtering of incoming http requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 407 diff changeset	312
893 f57802f8b4dc plugins for windows Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	313 static void PrintHelp(char* path)
133 1969ff16457c help Sebastien Jodogne <s.jodogne@gmail.com> parents: 128 diff changeset	314 {
1969ff16457c help Sebastien Jodogne <s.jodogne@gmail.com> parents: 128 diff changeset	315 std::cout
1969ff16457c help Sebastien Jodogne <s.jodogne@gmail.com> parents: 128 diff changeset	316 << "Usage: " << path << " [OPTION]... [CONFIGURATION]" << std::endl
175 662af781a227 sample config file from command line Sebastien Jodogne <s.jodogne@gmail.com> parents: 158 diff changeset	317 << "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	318 << std::endl
175 662af781a227 sample config file from command line Sebastien Jodogne <s.jodogne@gmail.com> parents: 158 diff changeset	319 << "If no configuration file is given on the command line, a set of default " << std::endl
662af781a227 sample config file from command line Sebastien Jodogne <s.jodogne@gmail.com> parents: 158 diff changeset	320 << "parameters is used. Please refer to the Orthanc homepage for the full " << std::endl
662af781a227 sample config file from command line Sebastien Jodogne <s.jodogne@gmail.com> parents: 158 diff changeset	321 << "instructions about how to use Orthanc " << std::endl
133 1969ff16457c help Sebastien Jodogne <s.jodogne@gmail.com> parents: 128 diff changeset	322 << "<https://code.google.com/p/orthanc/wiki/OrthancCookbook>." << std::endl
1969ff16457c help Sebastien Jodogne <s.jodogne@gmail.com> parents: 128 diff changeset	323 << std::endl
1969ff16457c help Sebastien Jodogne <s.jodogne@gmail.com> parents: 128 diff changeset	324 << "Command-line options:" << std::endl
1969ff16457c help Sebastien Jodogne <s.jodogne@gmail.com> parents: 128 diff changeset	325 << " --help\t\tdisplay this help and exit" << std::endl
1969ff16457c help Sebastien Jodogne <s.jodogne@gmail.com> parents: 128 diff changeset	326 << " --logdir=[dir]\tdirectory where to store the log files" << std::endl
1969ff16457c help Sebastien Jodogne <s.jodogne@gmail.com> parents: 128 diff changeset	327 << "\t\t\t(if not used, the logs are dumped to stderr)" << std::endl
175 662af781a227 sample config file from command line Sebastien Jodogne <s.jodogne@gmail.com> parents: 158 diff changeset	328 << " --config=[file]\tcreate a sample configuration file and exit" << std::endl
662af781a227 sample config file from command line Sebastien Jodogne <s.jodogne@gmail.com> parents: 158 diff changeset	329 << " --trace\t\thighest verbosity in logs (for debug)" << std::endl
662af781a227 sample config file from command line Sebastien Jodogne <s.jodogne@gmail.com> parents: 158 diff changeset	330 << " --verbose\t\tbe verbose in logs" << std::endl
662af781a227 sample config file from command line Sebastien Jodogne <s.jodogne@gmail.com> parents: 158 diff changeset	331 << " --version\t\toutput version information and exit" << std::endl
133 1969ff16457c help Sebastien Jodogne <s.jodogne@gmail.com> parents: 128 diff changeset	332 << std::endl
1969ff16457c help Sebastien Jodogne <s.jodogne@gmail.com> parents: 128 diff changeset	333 << "Exit status:" << std::endl
1969ff16457c help Sebastien Jodogne <s.jodogne@gmail.com> parents: 128 diff changeset	334 << " 0 if OK," << std::endl
1969ff16457c help Sebastien Jodogne <s.jodogne@gmail.com> parents: 128 diff changeset	335 << " -1 if error (have a look at the logs)." << std::endl
1969ff16457c help Sebastien Jodogne <s.jodogne@gmail.com> parents: 128 diff changeset	336 << std::endl;
1969ff16457c help Sebastien Jodogne <s.jodogne@gmail.com> parents: 128 diff changeset	337 }
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	338
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	339
893 f57802f8b4dc plugins for windows Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	340 static void PrintVersion(char* path)
133 1969ff16457c help Sebastien Jodogne <s.jodogne@gmail.com> parents: 128 diff changeset	341 {
1969ff16457c help Sebastien Jodogne <s.jodogne@gmail.com> parents: 128 diff changeset	342 std::cout
1969ff16457c help Sebastien Jodogne <s.jodogne@gmail.com> parents: 128 diff changeset	343 << path << " " << ORTHANC_VERSION << std::endl
1289 5810700b68fa upgrade to year 2015 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	344 << "Copyright (C) 2012-2015 Sebastien Jodogne, Medical Physics Department, University Hospital of Liege (Belgium)" << std::endl
133 1969ff16457c help Sebastien Jodogne <s.jodogne@gmail.com> parents: 128 diff changeset	345 << "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	346 << "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	347 << "There is NO WARRANTY, to the extent permitted by law." << std::endl
1969ff16457c help Sebastien Jodogne <s.jodogne@gmail.com> parents: 128 diff changeset	348 << std::endl
1969ff16457c help Sebastien Jodogne <s.jodogne@gmail.com> parents: 128 diff changeset	349 << "Written by Sebastien Jodogne <s.jodogne@gmail.com>" << std::endl;
1969ff16457c help Sebastien Jodogne <s.jodogne@gmail.com> parents: 128 diff changeset	350 }
1969ff16457c help Sebastien Jodogne <s.jodogne@gmail.com> parents: 128 diff changeset	351
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	352
893 f57802f8b4dc plugins for windows Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	353
f57802f8b4dc plugins for windows Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	354 static void LoadLuaScripts(ServerContext& context)
f57802f8b4dc plugins for windows Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	355 {
f57802f8b4dc plugins for windows Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	356 std::list<std::string> luaScripts;
f57802f8b4dc plugins for windows Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	357 Configuration::GetGlobalListOfStringsParameter(luaScripts, "LuaScripts");
f57802f8b4dc plugins for windows Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	358 for (std::list<std::string>::const_iterator
f57802f8b4dc plugins for windows Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	359 it = luaScripts.begin(); it != luaScripts.end(); ++it)
f57802f8b4dc plugins for windows Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	360 {
f57802f8b4dc plugins for windows Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	361 std::string path = Configuration::InterpretStringParameterAsPath(*it);
f57802f8b4dc plugins for windows Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	362 LOG(WARNING) << "Installing the Lua scripts from: " << path;
f57802f8b4dc plugins for windows Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	363 std::string script;
f57802f8b4dc plugins for windows Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	364 Toolbox::ReadFile(script, path);
1018 564e39d6df13 integration mainline->lua-scripting Sebastien Jodogne <s.jodogne@gmail.com> parents: 1005 943 diff changeset	365
1433 461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	366 LuaScripting::Locker locker(context.GetLua());
1018 564e39d6df13 integration mainline->lua-scripting Sebastien Jodogne <s.jodogne@gmail.com> parents: 1005 943 diff changeset	367 locker.GetLua().Execute(script);
893 f57802f8b4dc plugins for windows Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	368 }
f57802f8b4dc plugins for windows Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	369 }
f57802f8b4dc plugins for windows Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	370
f57802f8b4dc plugins for windows Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	371
1434 f9cd40166269 refactoring of OrthancPlugins, improvement in ServeFolders Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	372 static void LoadPlugins(OrthancPlugins& plugins)
893 f57802f8b4dc plugins for windows Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	373 {
1434 f9cd40166269 refactoring of OrthancPlugins, improvement in ServeFolders Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	374 std::list<std::string> path;
f9cd40166269 refactoring of OrthancPlugins, improvement in ServeFolders Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	375 Configuration::GetGlobalListOfStringsParameter(path, "Plugins");
893 f57802f8b4dc plugins for windows Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	376 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	377 it = path.begin(); it != path.end(); ++it)
893 f57802f8b4dc plugins for windows Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	378 {
f57802f8b4dc plugins for windows Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	379 std::string path = Configuration::InterpretStringParameterAsPath(*it);
1321 0f9e0e808e0f more explicit message Sebastien Jodogne <s.jodogne@gmail.com> parents: 1310 diff changeset	380 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	381 plugins.GetManager().RegisterPlugin(path);
893 f57802f8b4dc plugins for windows Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	382 }
f57802f8b4dc plugins for windows Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	383 }
f57802f8b4dc plugins for windows Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	384
f57802f8b4dc plugins for windows Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	385
f57802f8b4dc plugins for windows Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	386
1368 b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1366 diff changeset	387
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1366 diff changeset	388
1280 d6a65dc6d0ac Plugins can access the command-line arguments used to launch Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 1274 diff changeset	389 static bool StartOrthanc(int argc, char *argv[])
1103 bec1eccf976c Hot restart of Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 1102 diff changeset	390 {
1310 61ce8147f30d custom database back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1289 diff changeset	391 #if ENABLE_PLUGINS == 1
1434 f9cd40166269 refactoring of OrthancPlugins, improvement in ServeFolders Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	392 OrthancPlugins plugins;
f9cd40166269 refactoring of OrthancPlugins, improvement in ServeFolders Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	393 plugins.SetCommandLineArguments(argc, argv);
f9cd40166269 refactoring of OrthancPlugins, improvement in ServeFolders Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	394 LoadPlugins(plugins);
1310 61ce8147f30d custom database back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1289 diff changeset	395 #endif
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1245 diff changeset	396
1310 61ce8147f30d custom database back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1289 diff changeset	397 // "storage" and "database" must be declared BEFORE "ServerContext
61ce8147f30d custom database back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1289 diff changeset	398 // context", to avoid mess in the invokation order of the destructors.
61ce8147f30d custom database back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1289 diff changeset	399 std::auto_ptr<IDatabaseWrapper> database;
1135 67c3c1e4a6e0 index-only mode, and custom storage area with plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1134 diff changeset	400 std::auto_ptr<IStorageArea> storage;
1310 61ce8147f30d custom database back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1289 diff changeset	401 std::auto_ptr<ServerContext> context;
1127 f4e65808ea58 FilesystemStorageWithoutDicom Sebastien Jodogne <s.jodogne@gmail.com> parents: 1124 diff changeset	402
1434 f9cd40166269 refactoring of OrthancPlugins, improvement in ServeFolders Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	403 if (plugins.HasDatabase())
1310 61ce8147f30d custom database back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1289 diff changeset	404 {
1434 f9cd40166269 refactoring of OrthancPlugins, improvement in ServeFolders Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	405 context.reset(new ServerContext(plugins.GetDatabase()));
1310 61ce8147f30d custom database back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1289 diff changeset	406 }
61ce8147f30d custom database back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1289 diff changeset	407 else
61ce8147f30d custom database back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1289 diff changeset	408 {
61ce8147f30d custom database back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1289 diff changeset	409 database.reset(Configuration::CreateDatabaseWrapper());
61ce8147f30d custom database back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1289 diff changeset	410 context.reset(new ServerContext(*database));
61ce8147f30d custom database back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1289 diff changeset	411 }
1103 bec1eccf976c Hot restart of Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 1102 diff changeset	412
1310 61ce8147f30d custom database back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1289 diff changeset	413 context->SetCompressionEnabled(Configuration::GetGlobalBoolParameter("StorageCompression", false));
61ce8147f30d custom database back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1289 diff changeset	414 context->SetStoreMD5ForAttachments(Configuration::GetGlobalBoolParameter("StoreMD5ForAttachments", true));
61ce8147f30d custom database back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1289 diff changeset	415
61ce8147f30d custom database back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1289 diff changeset	416 LoadLuaScripts(*context);
1103 bec1eccf976c Hot restart of Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 1102 diff changeset	417
bec1eccf976c Hot restart of Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 1102 diff changeset	418 try
bec1eccf976c Hot restart of Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 1102 diff changeset	419 {
1310 61ce8147f30d custom database back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1289 diff changeset	420 context->GetIndex().SetMaximumPatientCount(Configuration::GetGlobalIntegerParameter("MaximumPatientCount", 0));
1103 bec1eccf976c Hot restart of Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 1102 diff changeset	421 }
bec1eccf976c Hot restart of Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 1102 diff changeset	422 catch (...)
bec1eccf976c Hot restart of Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 1102 diff changeset	423 {
1310 61ce8147f30d custom database back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1289 diff changeset	424 context->GetIndex().SetMaximumPatientCount(0);
1103 bec1eccf976c Hot restart of Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 1102 diff changeset	425 }
bec1eccf976c Hot restart of Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 1102 diff changeset	426
bec1eccf976c Hot restart of Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 1102 diff changeset	427 try
bec1eccf976c Hot restart of Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 1102 diff changeset	428 {
bec1eccf976c Hot restart of Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 1102 diff changeset	429 uint64_t size = Configuration::GetGlobalIntegerParameter("MaximumStorageSize", 0);
1310 61ce8147f30d custom database back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1289 diff changeset	430 context->GetIndex().SetMaximumStorageSize(size * 1024 * 1024);
1103 bec1eccf976c Hot restart of Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 1102 diff changeset	431 }
bec1eccf976c Hot restart of Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 1102 diff changeset	432 catch (...)
bec1eccf976c Hot restart of Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 1102 diff changeset	433 {
1310 61ce8147f30d custom database back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1289 diff changeset	434 context->GetIndex().SetMaximumStorageSize(0);
1103 bec1eccf976c Hot restart of Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 1102 diff changeset	435 }
bec1eccf976c Hot restart of Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 1102 diff changeset	436
1443 895ab369d63c refactoring: OrthancHttpHandler Sebastien Jodogne <s.jodogne@gmail.com> parents: 1437 diff changeset	437
895ab369d63c refactoring: OrthancHttpHandler Sebastien Jodogne <s.jodogne@gmail.com> parents: 1437 diff changeset	438 OrthancHttpHandler httpHandler;
895ab369d63c refactoring: OrthancHttpHandler Sebastien Jodogne <s.jodogne@gmail.com> parents: 1437 diff changeset	439
895ab369d63c refactoring: OrthancHttpHandler Sebastien Jodogne <s.jodogne@gmail.com> parents: 1437 diff changeset	440 #if ENABLE_PLUGINS == 1
895ab369d63c refactoring: OrthancHttpHandler Sebastien Jodogne <s.jodogne@gmail.com> parents: 1437 diff changeset	441 OrthancRestApi restApi(*context);
895ab369d63c refactoring: OrthancHttpHandler Sebastien Jodogne <s.jodogne@gmail.com> parents: 1437 diff changeset	442 plugins.SetServerContext(*context);
895ab369d63c refactoring: OrthancHttpHandler Sebastien Jodogne <s.jodogne@gmail.com> parents: 1437 diff changeset	443 httpHandler.Register(plugins, false);
895ab369d63c refactoring: OrthancHttpHandler Sebastien Jodogne <s.jodogne@gmail.com> parents: 1437 diff changeset	444 context->SetPlugins(plugins);
895ab369d63c refactoring: OrthancHttpHandler Sebastien Jodogne <s.jodogne@gmail.com> parents: 1437 diff changeset	445 #endif
895ab369d63c refactoring: OrthancHttpHandler Sebastien Jodogne <s.jodogne@gmail.com> parents: 1437 diff changeset	446
895ab369d63c refactoring: OrthancHttpHandler Sebastien Jodogne <s.jodogne@gmail.com> parents: 1437 diff changeset	447 #if ORTHANC_STANDALONE == 1
895ab369d63c refactoring: OrthancHttpHandler Sebastien Jodogne <s.jodogne@gmail.com> parents: 1437 diff changeset	448 EmbeddedResourceHttpHandler staticResources("/app", EmbeddedResources::ORTHANC_EXPLORER);
895ab369d63c refactoring: OrthancHttpHandler Sebastien Jodogne <s.jodogne@gmail.com> parents: 1437 diff changeset	449 #else
895ab369d63c refactoring: OrthancHttpHandler Sebastien Jodogne <s.jodogne@gmail.com> parents: 1437 diff changeset	450 FilesystemHttpHandler staticResources("/app", ORTHANC_PATH "/OrthancExplorer");
895ab369d63c refactoring: OrthancHttpHandler Sebastien Jodogne <s.jodogne@gmail.com> parents: 1437 diff changeset	451 #endif
895ab369d63c refactoring: OrthancHttpHandler Sebastien Jodogne <s.jodogne@gmail.com> parents: 1437 diff changeset	452
895ab369d63c refactoring: OrthancHttpHandler Sebastien Jodogne <s.jodogne@gmail.com> parents: 1437 diff changeset	453 httpHandler.Register(staticResources, false);
895ab369d63c refactoring: OrthancHttpHandler Sebastien Jodogne <s.jodogne@gmail.com> parents: 1437 diff changeset	454 httpHandler.Register(restApi, true);
895ab369d63c refactoring: OrthancHttpHandler Sebastien Jodogne <s.jodogne@gmail.com> parents: 1437 diff changeset	455
895ab369d63c refactoring: OrthancHttpHandler Sebastien Jodogne <s.jodogne@gmail.com> parents: 1437 diff changeset	456
895ab369d63c refactoring: OrthancHttpHandler Sebastien Jodogne <s.jodogne@gmail.com> parents: 1437 diff changeset	457
1310 61ce8147f30d custom database back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1289 diff changeset	458 MyDicomServerFactory serverFactory(*context);
1103 bec1eccf976c Hot restart of Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 1102 diff changeset	459 bool isReset = false;
bec1eccf976c Hot restart of Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 1102 diff changeset	460
bec1eccf976c Hot restart of Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 1102 diff changeset	461 {
bec1eccf976c Hot restart of Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 1102 diff changeset	462 // DICOM server
bec1eccf976c Hot restart of Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 1102 diff changeset	463 DicomServer dicomServer;
1310 61ce8147f30d custom database back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1289 diff changeset	464 OrthancApplicationEntityFilter dicomFilter(*context);
1103 bec1eccf976c Hot restart of Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 1102 diff changeset	465 dicomServer.SetCalledApplicationEntityTitleCheck(Configuration::GetGlobalBoolParameter("DicomCheckCalledAet", false));
bec1eccf976c Hot restart of Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 1102 diff changeset	466 dicomServer.SetStoreRequestHandlerFactory(serverFactory);
bec1eccf976c Hot restart of Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 1102 diff changeset	467 dicomServer.SetMoveRequestHandlerFactory(serverFactory);
bec1eccf976c Hot restart of Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 1102 diff changeset	468 dicomServer.SetFindRequestHandlerFactory(serverFactory);
bec1eccf976c Hot restart of Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 1102 diff changeset	469 dicomServer.SetPortNumber(Configuration::GetGlobalIntegerParameter("DicomPort", 4242));
bec1eccf976c Hot restart of Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 1102 diff changeset	470 dicomServer.SetApplicationEntityTitle(Configuration::GetGlobalStringParameter("DicomAet", "ORTHANC"));
bec1eccf976c Hot restart of Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 1102 diff changeset	471 dicomServer.SetApplicationEntityFilter(dicomFilter);
bec1eccf976c Hot restart of Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 1102 diff changeset	472
bec1eccf976c Hot restart of Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 1102 diff changeset	473 // HTTP server
1310 61ce8147f30d custom database back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1289 diff changeset	474 MyIncomingHttpRequestFilter httpFilter(*context);
1103 bec1eccf976c Hot restart of Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 1102 diff changeset	475 MongooseServer httpServer;
bec1eccf976c Hot restart of Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 1102 diff changeset	476 httpServer.SetPortNumber(Configuration::GetGlobalIntegerParameter("HttpPort", 8042));
bec1eccf976c Hot restart of Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 1102 diff changeset	477 httpServer.SetRemoteAccessAllowed(Configuration::GetGlobalBoolParameter("RemoteAccessAllowed", false));
1115 da56a7916e8a Experimental "KeepAlive" configuration option to enable HTTP Keep-Alive Sebastien Jodogne <s.jodogne@gmail.com> parents: 1103 diff changeset	478 httpServer.SetKeepAliveEnabled(Configuration::GetGlobalBoolParameter("KeepAlive", false));
1103 bec1eccf976c Hot restart of Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 1102 diff changeset	479 httpServer.SetIncomingHttpRequestFilter(httpFilter);
bec1eccf976c Hot restart of Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 1102 diff changeset	480
bec1eccf976c Hot restart of Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 1102 diff changeset	481 httpServer.SetAuthenticationEnabled(Configuration::GetGlobalBoolParameter("AuthenticationEnabled", false));
bec1eccf976c Hot restart of Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 1102 diff changeset	482 Configuration::SetupRegisteredUsers(httpServer);
bec1eccf976c Hot restart of Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 1102 diff changeset	483
bec1eccf976c Hot restart of Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 1102 diff changeset	484 if (Configuration::GetGlobalBoolParameter("SslEnabled", false))
bec1eccf976c Hot restart of Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 1102 diff changeset	485 {
bec1eccf976c Hot restart of Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 1102 diff changeset	486 std::string certificate = Configuration::InterpretStringParameterAsPath(
bec1eccf976c Hot restart of Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 1102 diff changeset	487 Configuration::GetGlobalStringParameter("SslCertificate", "certificate.pem"));
bec1eccf976c Hot restart of Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 1102 diff changeset	488 httpServer.SetSslEnabled(true);
bec1eccf976c Hot restart of Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 1102 diff changeset	489 httpServer.SetSslCertificate(certificate.c_str());
bec1eccf976c Hot restart of Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 1102 diff changeset	490 }
bec1eccf976c Hot restart of Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 1102 diff changeset	491 else
bec1eccf976c Hot restart of Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 1102 diff changeset	492 {
bec1eccf976c Hot restart of Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 1102 diff changeset	493 httpServer.SetSslEnabled(false);
bec1eccf976c Hot restart of Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 1102 diff changeset	494 }
bec1eccf976c Hot restart of Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 1102 diff changeset	495
1443 895ab369d63c refactoring: OrthancHttpHandler Sebastien Jodogne <s.jodogne@gmail.com> parents: 1437 diff changeset	496 httpServer.Register(httpHandler);
1103 bec1eccf976c Hot restart of Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 1102 diff changeset	497
1135 67c3c1e4a6e0 index-only mode, and custom storage area with plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1134 diff changeset	498
1193 e95e7f9eba96 fix crash when stopping Orthanc during a DICOM connection Sebastien Jodogne <s.jodogne@gmail.com> parents: 1171 diff changeset	499 #if ENABLE_PLUGINS == 1
1135 67c3c1e4a6e0 index-only mode, and custom storage area with plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1134 diff changeset	500 // Prepare the storage area
1434 f9cd40166269 refactoring of OrthancPlugins, improvement in ServeFolders Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	501 if (plugins.HasStorageArea())
1135 67c3c1e4a6e0 index-only mode, and custom storage area with plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1134 diff changeset	502 {
67c3c1e4a6e0 index-only mode, and custom storage area with plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1134 diff changeset	503 LOG(WARNING) << "Using a custom storage area from plugins";
1434 f9cd40166269 refactoring of OrthancPlugins, improvement in ServeFolders Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	504 storage.reset(plugins.GetStorageArea());
1135 67c3c1e4a6e0 index-only mode, and custom storage area with plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1134 diff changeset	505 }
67c3c1e4a6e0 index-only mode, and custom storage area with plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1134 diff changeset	506 else
1193 e95e7f9eba96 fix crash when stopping Orthanc during a DICOM connection Sebastien Jodogne <s.jodogne@gmail.com> parents: 1171 diff changeset	507 #endif
1135 67c3c1e4a6e0 index-only mode, and custom storage area with plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1134 diff changeset	508 {
1274 b9e2ed59cae4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1250 diff changeset	509 storage.reset(Configuration::CreateStorageArea());
1135 67c3c1e4a6e0 index-only mode, and custom storage area with plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1134 diff changeset	510 }
67c3c1e4a6e0 index-only mode, and custom storage area with plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1134 diff changeset	511
1310 61ce8147f30d custom database back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1289 diff changeset	512 context->SetStorageArea(*storage);
1437 02f5a3f5c0a0 access to the REST API from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1436 diff changeset	513 context->GetLua().SetOrthancRestApi(restApi);
1135 67c3c1e4a6e0 index-only mode, and custom storage area with plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1134 diff changeset	514
1103 bec1eccf976c Hot restart of Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 1102 diff changeset	515 // GO !!! Start the requested servers
bec1eccf976c Hot restart of Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 1102 diff changeset	516 if (Configuration::GetGlobalBoolParameter("HttpServerEnabled", true))
bec1eccf976c Hot restart of Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 1102 diff changeset	517 {
1328 b7351ecb79b4 fix in the plugin destruction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1321 diff changeset	518 #if ENABLE_PLUGINS == 1
1434 f9cd40166269 refactoring of OrthancPlugins, improvement in ServeFolders Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	519 plugins.SetOrthancRestApi(restApi);
1328 b7351ecb79b4 fix in the plugin destruction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1321 diff changeset	520 #endif
b7351ecb79b4 fix in the plugin destruction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1321 diff changeset	521
1103 bec1eccf976c Hot restart of Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 1102 diff changeset	522 httpServer.Start();
bec1eccf976c Hot restart of Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 1102 diff changeset	523 LOG(WARNING) << "HTTP server listening on port: " << httpServer.GetPortNumber();
bec1eccf976c Hot restart of Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 1102 diff changeset	524 }
bec1eccf976c Hot restart of Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 1102 diff changeset	525 else
bec1eccf976c Hot restart of Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 1102 diff changeset	526 {
bec1eccf976c Hot restart of Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 1102 diff changeset	527 LOG(WARNING) << "The HTTP server is disabled";
bec1eccf976c Hot restart of Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 1102 diff changeset	528 }
bec1eccf976c Hot restart of Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 1102 diff changeset	529
bec1eccf976c Hot restart of Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 1102 diff changeset	530 if (Configuration::GetGlobalBoolParameter("DicomServerEnabled", true))
bec1eccf976c Hot restart of Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 1102 diff changeset	531 {
bec1eccf976c Hot restart of Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 1102 diff changeset	532 dicomServer.Start();
bec1eccf976c Hot restart of Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 1102 diff changeset	533 LOG(WARNING) << "DICOM server listening on port: " << dicomServer.GetPortNumber();
bec1eccf976c Hot restart of Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 1102 diff changeset	534 }
bec1eccf976c Hot restart of Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 1102 diff changeset	535 else
bec1eccf976c Hot restart of Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 1102 diff changeset	536 {
bec1eccf976c Hot restart of Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 1102 diff changeset	537 LOG(WARNING) << "The DICOM server is disabled";
bec1eccf976c Hot restart of Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 1102 diff changeset	538 }
bec1eccf976c Hot restart of Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 1102 diff changeset	539
bec1eccf976c Hot restart of Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 1102 diff changeset	540 LOG(WARNING) << "Orthanc has started";
1366 a3559b66fba7 move primitives Sebastien Jodogne <s.jodogne@gmail.com> parents: 1364 diff changeset	541
1103 bec1eccf976c Hot restart of Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 1102 diff changeset	542 Toolbox::ServerBarrier(restApi.ResetRequestReceivedFlag());
bec1eccf976c Hot restart of Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 1102 diff changeset	543 isReset = restApi.ResetRequestReceivedFlag();
bec1eccf976c Hot restart of Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 1102 diff changeset	544
bec1eccf976c Hot restart of Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 1102 diff changeset	545 if (isReset)
bec1eccf976c Hot restart of Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 1102 diff changeset	546 {
bec1eccf976c Hot restart of Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 1102 diff changeset	547 LOG(WARNING) << "Reset request received, restarting Orthanc";
bec1eccf976c Hot restart of Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 1102 diff changeset	548 }
bec1eccf976c Hot restart of Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 1102 diff changeset	549
bec1eccf976c Hot restart of Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 1102 diff changeset	550 // We're done
bec1eccf976c Hot restart of Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 1102 diff changeset	551 LOG(WARNING) << "Orthanc is stopping";
1193 e95e7f9eba96 fix crash when stopping Orthanc during a DICOM connection Sebastien Jodogne <s.jodogne@gmail.com> parents: 1171 diff changeset	552
1199 a843ee8bb903 separated thread for change callbacks in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1193 diff changeset	553 #if ENABLE_PLUGINS == 1
1434 f9cd40166269 refactoring of OrthancPlugins, improvement in ServeFolders Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	554 context->ResetPlugins();
f9cd40166269 refactoring of OrthancPlugins, improvement in ServeFolders Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	555 plugins.ResetOrthancRestApi();
1210 178de5edc0a8 comments Sebastien Jodogne <s.jodogne@gmail.com> parents: 1199 diff changeset	556 LOG(WARNING) << " Plugins have stopped";
1199 a843ee8bb903 separated thread for change callbacks in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1193 diff changeset	557 #endif
a843ee8bb903 separated thread for change callbacks in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1193 diff changeset	558
1437 02f5a3f5c0a0 access to the REST API from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1436 diff changeset	559 context->GetLua().ResetOrthancRestApi();
02f5a3f5c0a0 access to the REST API from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1436 diff changeset	560
1193 e95e7f9eba96 fix crash when stopping Orthanc during a DICOM connection Sebastien Jodogne <s.jodogne@gmail.com> parents: 1171 diff changeset	561 dicomServer.Stop();
1210 178de5edc0a8 comments Sebastien Jodogne <s.jodogne@gmail.com> parents: 1199 diff changeset	562 LOG(WARNING) << " DICOM server has stopped";
178de5edc0a8 comments Sebastien Jodogne <s.jodogne@gmail.com> parents: 1199 diff changeset	563
1193 e95e7f9eba96 fix crash when stopping Orthanc during a DICOM connection Sebastien Jodogne <s.jodogne@gmail.com> parents: 1171 diff changeset	564 httpServer.Stop();
1210 178de5edc0a8 comments Sebastien Jodogne <s.jodogne@gmail.com> parents: 1199 diff changeset	565 LOG(WARNING) << " HTTP server has stopped";
1103 bec1eccf976c Hot restart of Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 1102 diff changeset	566 }
bec1eccf976c Hot restart of Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 1102 diff changeset	567
bec1eccf976c Hot restart of Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 1102 diff changeset	568 serverFactory.Done();
bec1eccf976c Hot restart of Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 1102 diff changeset	569
bec1eccf976c Hot restart of Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 1102 diff changeset	570 return isReset;
bec1eccf976c Hot restart of Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 1102 diff changeset	571 }
bec1eccf976c Hot restart of Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 1102 diff changeset	572
bec1eccf976c Hot restart of Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 1102 diff changeset	573
bec1eccf976c Hot restart of Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 1102 diff changeset	574
893 f57802f8b4dc plugins for windows Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	575
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	576 int main(int argc, char* argv[])
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	577 {
102 7593b57dc1bf switch to google log Sebastien Jodogne <s.jodogne@gmail.com> parents: 62 diff changeset	578 // Initialize Google's logging library.
7593b57dc1bf switch to google log Sebastien Jodogne <s.jodogne@gmail.com> parents: 62 diff changeset	579 FLAGS_logtostderr = true;
137 0e97abc7b950 fix of a bug in older versions of sqlite Sebastien Jodogne <s.jodogne@gmail.com> parents: 136 diff changeset	580 FLAGS_minloglevel = 1;
0e97abc7b950 fix of a bug in older versions of sqlite Sebastien Jodogne <s.jodogne@gmail.com> parents: 136 diff changeset	581 FLAGS_v = 0;
133 1969ff16457c help Sebastien Jodogne <s.jodogne@gmail.com> parents: 128 diff changeset	582
112 80ca409f232f logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 108 diff changeset	583 for (int i = 1; i < argc; i++)
80ca409f232f logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 108 diff changeset	584 {
133 1969ff16457c help Sebastien Jodogne <s.jodogne@gmail.com> parents: 128 diff changeset	585 if (std::string(argv[i]) == "--help")
1969ff16457c help Sebastien Jodogne <s.jodogne@gmail.com> parents: 128 diff changeset	586 {
1969ff16457c help Sebastien Jodogne <s.jodogne@gmail.com> parents: 128 diff changeset	587 PrintHelp(argv[0]);
1969ff16457c help Sebastien Jodogne <s.jodogne@gmail.com> parents: 128 diff changeset	588 return 0;
1969ff16457c help Sebastien Jodogne <s.jodogne@gmail.com> parents: 128 diff changeset	589 }
1969ff16457c help Sebastien Jodogne <s.jodogne@gmail.com> parents: 128 diff changeset	590
1969ff16457c help Sebastien Jodogne <s.jodogne@gmail.com> parents: 128 diff changeset	591 if (std::string(argv[i]) == "--version")
1969ff16457c help Sebastien Jodogne <s.jodogne@gmail.com> parents: 128 diff changeset	592 {
1969ff16457c help Sebastien Jodogne <s.jodogne@gmail.com> parents: 128 diff changeset	593 PrintVersion(argv[0]);
1969ff16457c help Sebastien Jodogne <s.jodogne@gmail.com> parents: 128 diff changeset	594 return 0;
1969ff16457c help Sebastien Jodogne <s.jodogne@gmail.com> parents: 128 diff changeset	595 }
1969ff16457c help Sebastien Jodogne <s.jodogne@gmail.com> parents: 128 diff changeset	596
137 0e97abc7b950 fix of a bug in older versions of sqlite Sebastien Jodogne <s.jodogne@gmail.com> parents: 136 diff changeset	597 if (std::string(argv[i]) == "--verbose")
0e97abc7b950 fix of a bug in older versions of sqlite Sebastien Jodogne <s.jodogne@gmail.com> parents: 136 diff changeset	598 {
0e97abc7b950 fix of a bug in older versions of sqlite Sebastien Jodogne <s.jodogne@gmail.com> parents: 136 diff changeset	599 FLAGS_minloglevel = 0;
0e97abc7b950 fix of a bug in older versions of sqlite Sebastien Jodogne <s.jodogne@gmail.com> parents: 136 diff changeset	600 }
0e97abc7b950 fix of a bug in older versions of sqlite Sebastien Jodogne <s.jodogne@gmail.com> parents: 136 diff changeset	601
0e97abc7b950 fix of a bug in older versions of sqlite Sebastien Jodogne <s.jodogne@gmail.com> parents: 136 diff changeset	602 if (std::string(argv[i]) == "--trace")
0e97abc7b950 fix of a bug in older versions of sqlite Sebastien Jodogne <s.jodogne@gmail.com> parents: 136 diff changeset	603 {
0e97abc7b950 fix of a bug in older versions of sqlite Sebastien Jodogne <s.jodogne@gmail.com> parents: 136 diff changeset	604 FLAGS_minloglevel = 0;
0e97abc7b950 fix of a bug in older versions of sqlite Sebastien Jodogne <s.jodogne@gmail.com> parents: 136 diff changeset	605 FLAGS_v = 1;
0e97abc7b950 fix of a bug in older versions of sqlite Sebastien Jodogne <s.jodogne@gmail.com> parents: 136 diff changeset	606 }
0e97abc7b950 fix of a bug in older versions of sqlite Sebastien Jodogne <s.jodogne@gmail.com> parents: 136 diff changeset	607
112 80ca409f232f logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 108 diff changeset	608 if (boost::starts_with(argv[i], "--logdir="))
80ca409f232f logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 108 diff changeset	609 {
80ca409f232f logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 108 diff changeset	610 FLAGS_logtostderr = false;
80ca409f232f logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 108 diff changeset	611 FLAGS_log_dir = std::string(argv[i]).substr(9);
80ca409f232f logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 108 diff changeset	612 }
175 662af781a227 sample config file from command line Sebastien Jodogne <s.jodogne@gmail.com> parents: 158 diff changeset	613
662af781a227 sample config file from command line Sebastien Jodogne <s.jodogne@gmail.com> parents: 158 diff changeset	614 if (boost::starts_with(argv[i], "--config="))
662af781a227 sample config file from command line Sebastien Jodogne <s.jodogne@gmail.com> parents: 158 diff changeset	615 {
662af781a227 sample config file from command line Sebastien Jodogne <s.jodogne@gmail.com> parents: 158 diff changeset	616 std::string configurationSample;
662af781a227 sample config file from command line Sebastien Jodogne <s.jodogne@gmail.com> parents: 158 diff changeset	617 GetFileResource(configurationSample, EmbeddedResources::CONFIGURATION_SAMPLE);
662af781a227 sample config file from command line Sebastien Jodogne <s.jodogne@gmail.com> parents: 158 diff changeset	618
684 96d8410c56cd newlines Sebastien Jodogne <s.jodogne@gmail.com> parents: 657 diff changeset	619 #if defined(_WIN32)
96d8410c56cd newlines Sebastien Jodogne <s.jodogne@gmail.com> parents: 657 diff changeset	620 // Replace UNIX newlines with DOS newlines
96d8410c56cd newlines Sebastien Jodogne <s.jodogne@gmail.com> parents: 657 diff changeset	621 boost::replace_all(configurationSample, "\n", "\r\n");
96d8410c56cd newlines Sebastien Jodogne <s.jodogne@gmail.com> parents: 657 diff changeset	622 #endif
96d8410c56cd newlines Sebastien Jodogne <s.jodogne@gmail.com> parents: 657 diff changeset	623
175 662af781a227 sample config file from command line Sebastien Jodogne <s.jodogne@gmail.com> parents: 158 diff changeset	624 std::string target = std::string(argv[i]).substr(9);
662af781a227 sample config file from command line Sebastien Jodogne <s.jodogne@gmail.com> parents: 158 diff changeset	625 std::ofstream f(target.c_str());
662af781a227 sample config file from command line Sebastien Jodogne <s.jodogne@gmail.com> parents: 158 diff changeset	626 f << configurationSample;
662af781a227 sample config file from command line Sebastien Jodogne <s.jodogne@gmail.com> parents: 158 diff changeset	627 f.close();
662af781a227 sample config file from command line Sebastien Jodogne <s.jodogne@gmail.com> parents: 158 diff changeset	628 return 0;
662af781a227 sample config file from command line Sebastien Jodogne <s.jodogne@gmail.com> parents: 158 diff changeset	629 }
112 80ca409f232f logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 108 diff changeset	630 }
80ca409f232f logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 108 diff changeset	631
102 7593b57dc1bf switch to google log Sebastien Jodogne <s.jodogne@gmail.com> parents: 62 diff changeset	632 google::InitGoogleLogging("Orthanc");
7593b57dc1bf switch to google log Sebastien Jodogne <s.jodogne@gmail.com> parents: 62 diff changeset	633
1102 ce6386b37afd avoid unnecessary exceptions on Orthanc startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1066 diff changeset	634 const char* configurationFile = NULL;
ce6386b37afd avoid unnecessary exceptions on Orthanc startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1066 diff changeset	635 for (int i = 1; i < argc; i++)
ce6386b37afd avoid unnecessary exceptions on Orthanc startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1066 diff changeset	636 {
ce6386b37afd avoid unnecessary exceptions on Orthanc startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1066 diff changeset	637 // Use the first argument that does not start with a "-" as
ce6386b37afd avoid unnecessary exceptions on Orthanc startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1066 diff changeset	638 // the configuration file
ce6386b37afd avoid unnecessary exceptions on Orthanc startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1066 diff changeset	639 if (argv[i][0] != '-')
ce6386b37afd avoid unnecessary exceptions on Orthanc startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1066 diff changeset	640 {
ce6386b37afd avoid unnecessary exceptions on Orthanc startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1066 diff changeset	641 configurationFile = argv[i];
ce6386b37afd avoid unnecessary exceptions on Orthanc startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1066 diff changeset	642 }
ce6386b37afd avoid unnecessary exceptions on Orthanc startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1066 diff changeset	643 }
ce6386b37afd avoid unnecessary exceptions on Orthanc startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1066 diff changeset	644
1171 fd3128b2cf45 log version on startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1164 diff changeset	645 LOG(WARNING) << "Orthanc version: " << ORTHANC_VERSION;
1102 ce6386b37afd avoid unnecessary exceptions on Orthanc startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1066 diff changeset	646
291 4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 270 diff changeset	647 int status = 0;
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	648 try
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	649 {
1103 bec1eccf976c Hot restart of Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 1102 diff changeset	650 for (;;)
270 e6a4c4329481 parameters for storage capacity Sebastien Jodogne <s.jodogne@gmail.com> parents: 236 diff changeset	651 {
1103 bec1eccf976c Hot restart of Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 1102 diff changeset	652 OrthancInitialize(configurationFile);
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	653
1280 d6a65dc6d0ac Plugins can access the command-line arguments used to launch Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 1274 diff changeset	654 bool reset = StartOrthanc(argc, argv);
1103 bec1eccf976c Hot restart of Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 1102 diff changeset	655 if (reset)
23 62bd05fe4b7c support for ssl Sebastien Jodogne <s.jodogne@gmail.com> parents: 19 diff changeset	656 {
1103 bec1eccf976c Hot restart of Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 1102 diff changeset	657 OrthancFinalize();
23 62bd05fe4b7c support for ssl Sebastien Jodogne <s.jodogne@gmail.com> parents: 19 diff changeset	658 }
62bd05fe4b7c support for ssl Sebastien Jodogne <s.jodogne@gmail.com> parents: 19 diff changeset	659 else
62bd05fe4b7c support for ssl Sebastien Jodogne <s.jodogne@gmail.com> parents: 19 diff changeset	660 {
1103 bec1eccf976c Hot restart of Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 1102 diff changeset	661 break;
23 62bd05fe4b7c support for ssl Sebastien Jodogne <s.jodogne@gmail.com> parents: 19 diff changeset	662 }
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	663 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	664 }
1245 aea9277dee75 catch more exceptions (patch from Valdas Rapsevicius) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1232 diff changeset	665 catch (const OrthancException& e)
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	666 {
1103 bec1eccf976c Hot restart of Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 1102 diff changeset	667 LOG(ERROR) << "Uncaught exception, stopping now: [" << e.What() << "]";
291 4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 270 diff changeset	668 status = -1;
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 270 diff changeset	669 }
1245 aea9277dee75 catch more exceptions (patch from Valdas Rapsevicius) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1232 diff changeset	670 catch (const std::exception& e)
aea9277dee75 catch more exceptions (patch from Valdas Rapsevicius) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1232 diff changeset	671 {
aea9277dee75 catch more exceptions (patch from Valdas Rapsevicius) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1232 diff changeset	672 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	673 status = -1;
aea9277dee75 catch more exceptions (patch from Valdas Rapsevicius) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1232 diff changeset	674 }
aea9277dee75 catch more exceptions (patch from Valdas Rapsevicius) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1232 diff changeset	675 catch (const std::string& s)
aea9277dee75 catch more exceptions (patch from Valdas Rapsevicius) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1232 diff changeset	676 {
aea9277dee75 catch more exceptions (patch from Valdas Rapsevicius) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1232 diff changeset	677 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	678 status = -1;
aea9277dee75 catch more exceptions (patch from Valdas Rapsevicius) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1232 diff changeset	679 }
291 4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 270 diff changeset	680 catch (...)
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 270 diff changeset	681 {
1223 5bd4c9f85b4c fix race condition while unregistering plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1210 diff changeset	682 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	683 status = -1;
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	684 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	685
62 a70bb32802ae renaming Server Sebastien Jodogne <s.jodogne@gmail.com> parents: 57 diff changeset	686 OrthancFinalize();
27 cfe212a513c5 openssl with visual studio Administrator@jodogne-w01 parents: 26 diff changeset	687
690 2e67366aab83 case-insensitive matching of Application Entity Titles Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	688 LOG(WARNING) << "Orthanc has stopped";
2e67366aab83 case-insensitive matching of Application Entity Titles Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	689
291 4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 270 diff changeset	690 return status;
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	691 }

Mercurial > hg > orthanc

annotate OrthancServer/main.cpp @ 1443:895ab369d63c