orthanc: OrthancServer/main.cpp annotate

annotate OrthancServer/main.cpp @ 1572:904096e7367e

More information about the origin request in OnStoredInstance() callbacks

author	Sebastien Jodogne <s.jodogne@gmail.com>
date	Tue, 25 Aug 2015 12:10:12 +0200
parents	e5e975e9b738
children	3309878b3e16

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>
112 80ca409f232f logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 108 diff changeset	37 #include <boost/algorithm/string/predicate.hpp>
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	38
1485 27661b33f624 Creation of Logging.h Sebastien Jodogne <s.jodogne@gmail.com> parents: 1455 diff changeset	39 #include "../Core/Logging.h"
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"
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	54
62 a70bb32802ae renaming Server Sebastien Jodogne <s.jodogne@gmail.com> parents: 57 diff changeset	55 using namespace Orthanc;
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	56
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	57
613 60d90e48e809 query/retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 565 diff changeset	58 class OrthancStoreRequestHandler : public IStoreRequestHandler
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	59 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	60 private:
388 466c992a9a42 testing filters inside orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 376 diff changeset	61 ServerContext& server_;
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	62
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	63 public:
613 60d90e48e809 query/retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 565 diff changeset	64 OrthancStoreRequestHandler(ServerContext& context) :
388 466c992a9a42 testing filters inside orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 376 diff changeset	65 server_(context)
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 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	68
291 4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 270 diff changeset	69 virtual void Handle(const std::string& dicomFile,
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	70 const DicomMap& dicomSummary,
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	71 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	72 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	73 const std::string& calledAet)
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	74 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	75 if (dicomFile.size() > 0)
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	76 {
1005 84b6d7bca6db refactoring of ServerContext::Store Sebastien Jodogne <s.jodogne@gmail.com> parents: 996 diff changeset	77 DicomInstanceToStore toStore;
1572 904096e7367e More information about the origin request in OnStoredInstance() callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1549 diff changeset	78 toStore.SetDicomProtocolOrigin(remoteAet.c_str(), calledAet.c_str());
1005 84b6d7bca6db refactoring of ServerContext::Store Sebastien Jodogne <s.jodogne@gmail.com> parents: 996 diff changeset	79 toStore.SetBuffer(dicomFile);
84b6d7bca6db refactoring of ServerContext::Store Sebastien Jodogne <s.jodogne@gmail.com> parents: 996 diff changeset	80 toStore.SetSummary(dicomSummary);
84b6d7bca6db refactoring of ServerContext::Store Sebastien Jodogne <s.jodogne@gmail.com> parents: 996 diff changeset	81 toStore.SetJson(dicomJson);
84b6d7bca6db refactoring of ServerContext::Store Sebastien Jodogne <s.jodogne@gmail.com> parents: 996 diff changeset	82
84b6d7bca6db refactoring of ServerContext::Store Sebastien Jodogne <s.jodogne@gmail.com> parents: 996 diff changeset	83 std::string id;
84b6d7bca6db refactoring of ServerContext::Store Sebastien Jodogne <s.jodogne@gmail.com> parents: 996 diff changeset	84 server_.Store(id, toStore);
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	85 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	86 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	87 };
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	88
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	89
613 60d90e48e809 query/retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 565 diff changeset	90
387 ff647eedfbe1 enabling of Find/Move commands Sebastien Jodogne <s.jodogne@gmail.com> parents: 376 diff changeset	91 class MyDicomServerFactory :
ff647eedfbe1 enabling of Find/Move commands Sebastien Jodogne <s.jodogne@gmail.com> parents: 376 diff changeset	92 public IStoreRequestHandlerFactory,
ff647eedfbe1 enabling of Find/Move commands Sebastien Jodogne <s.jodogne@gmail.com> parents: 376 diff changeset	93 public IFindRequestHandlerFactory,
ff647eedfbe1 enabling of Find/Move commands Sebastien Jodogne <s.jodogne@gmail.com> parents: 376 diff changeset	94 public IMoveRequestHandlerFactory
ff647eedfbe1 enabling of Find/Move commands Sebastien Jodogne <s.jodogne@gmail.com> parents: 376 diff changeset	95 {
ff647eedfbe1 enabling of Find/Move commands Sebastien Jodogne <s.jodogne@gmail.com> parents: 376 diff changeset	96 private:
ff647eedfbe1 enabling of Find/Move commands Sebastien Jodogne <s.jodogne@gmail.com> parents: 376 diff changeset	97 ServerContext& context_;
ff647eedfbe1 enabling of Find/Move commands Sebastien Jodogne <s.jodogne@gmail.com> parents: 376 diff changeset	98
ff647eedfbe1 enabling of Find/Move commands Sebastien Jodogne <s.jodogne@gmail.com> parents: 376 diff changeset	99 public:
ff647eedfbe1 enabling of Find/Move commands Sebastien Jodogne <s.jodogne@gmail.com> parents: 376 diff changeset	100 MyDicomServerFactory(ServerContext& context) : context_(context)
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	101 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	102 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	103
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	104 virtual IStoreRequestHandler* ConstructStoreRequestHandler()
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	105 {
613 60d90e48e809 query/retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 565 diff changeset	106 return new OrthancStoreRequestHandler(context_);
387 ff647eedfbe1 enabling of Find/Move commands Sebastien Jodogne <s.jodogne@gmail.com> parents: 376 diff changeset	107 }
ff647eedfbe1 enabling of Find/Move commands Sebastien Jodogne <s.jodogne@gmail.com> parents: 376 diff changeset	108
ff647eedfbe1 enabling of Find/Move commands Sebastien Jodogne <s.jodogne@gmail.com> parents: 376 diff changeset	109 virtual IFindRequestHandler* ConstructFindRequestHandler()
ff647eedfbe1 enabling of Find/Move commands Sebastien Jodogne <s.jodogne@gmail.com> parents: 376 diff changeset	110 {
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	111 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	112
83489fddd8c5 Options to limit the number of results for an incoming C-FIND query Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	113 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	114 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	115
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 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	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 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	119 }
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 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	121 {
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 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	123 << " 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	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
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 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	127 {
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 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	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 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	131 {
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 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	133 << " 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	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
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 return result.release();
387 ff647eedfbe1 enabling of Find/Move commands Sebastien Jodogne <s.jodogne@gmail.com> parents: 376 diff changeset	137 }
ff647eedfbe1 enabling of Find/Move commands Sebastien Jodogne <s.jodogne@gmail.com> parents: 376 diff changeset	138
ff647eedfbe1 enabling of Find/Move commands Sebastien Jodogne <s.jodogne@gmail.com> parents: 376 diff changeset	139 virtual IMoveRequestHandler* ConstructMoveRequestHandler()
ff647eedfbe1 enabling of Find/Move commands Sebastien Jodogne <s.jodogne@gmail.com> parents: 376 diff changeset	140 {
613 60d90e48e809 query/retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 565 diff changeset	141 return new OrthancMoveRequestHandler(context_);
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	142 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	143
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	144 void Done()
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	145 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	146 }
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
618 5ab377df6d8b filtering on aet Sebastien Jodogne <s.jodogne@gmail.com> parents: 614 diff changeset	150 class OrthancApplicationEntityFilter : public IApplicationEntityFilter
5ab377df6d8b filtering on aet Sebastien Jodogne <s.jodogne@gmail.com> parents: 614 diff changeset	151 {
1164 0a55d8eb194e Configuration/Lua to select the accepted C-Store SCP transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1163 diff changeset	152 private:
0a55d8eb194e Configuration/Lua to select the accepted C-Store SCP transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1163 diff changeset	153 ServerContext& context_;
0a55d8eb194e Configuration/Lua to select the accepted C-Store SCP transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1163 diff changeset	154
618 5ab377df6d8b filtering on aet Sebastien Jodogne <s.jodogne@gmail.com> parents: 614 diff changeset	155 public:
1164 0a55d8eb194e Configuration/Lua to select the accepted C-Store SCP transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1163 diff changeset	156 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	157 {
0a55d8eb194e Configuration/Lua to select the accepted C-Store SCP transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1163 diff changeset	158 }
0a55d8eb194e Configuration/Lua to select the accepted C-Store SCP transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1163 diff changeset	159
620 4aa6f0d79947 security filter for dicom requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 619 diff changeset	160 virtual bool IsAllowedConnection(const std::string& /callingIp/,
4aa6f0d79947 security filter for dicom requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 619 diff changeset	161 const std::string& /callingAet/)
618 5ab377df6d8b filtering on aet Sebastien Jodogne <s.jodogne@gmail.com> parents: 614 diff changeset	162 {
620 4aa6f0d79947 security filter for dicom requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 619 diff changeset	163 return true;
4aa6f0d79947 security filter for dicom requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 619 diff changeset	164 }
4aa6f0d79947 security filter for dicom requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 619 diff changeset	165
4aa6f0d79947 security filter for dicom requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 619 diff changeset	166 virtual bool IsAllowedRequest(const std::string& /callingIp/,
4aa6f0d79947 security filter for dicom requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 619 diff changeset	167 const std::string& callingAet,
4aa6f0d79947 security filter for dicom requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 619 diff changeset	168 DicomRequestType type)
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 if (type == DicomRequestType_Store)
4aa6f0d79947 security filter for dicom requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 619 diff changeset	171 {
4aa6f0d79947 security filter for dicom requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 619 diff changeset	172 // 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	173 return true;
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
810 401a9633e492 configuration into a namespace Sebastien Jodogne <s.jodogne@gmail.com> parents: 774 diff changeset	176 if (!Configuration::IsKnownAETitle(callingAet))
618 5ab377df6d8b filtering on aet Sebastien Jodogne <s.jodogne@gmail.com> parents: 614 diff changeset	177 {
725 ef4569ae7952 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 695 diff changeset	178 LOG(ERROR) << "Unknown remote DICOM modality AET: \"" << callingAet << "\"";
618 5ab377df6d8b filtering on aet Sebastien Jodogne <s.jodogne@gmail.com> parents: 614 diff changeset	179 return false;
5ab377df6d8b filtering on aet Sebastien Jodogne <s.jodogne@gmail.com> parents: 614 diff changeset	180 }
5ab377df6d8b filtering on aet Sebastien Jodogne <s.jodogne@gmail.com> parents: 614 diff changeset	181 else
5ab377df6d8b filtering on aet Sebastien Jodogne <s.jodogne@gmail.com> parents: 614 diff changeset	182 {
5ab377df6d8b filtering on aet Sebastien Jodogne <s.jodogne@gmail.com> parents: 614 diff changeset	183 return true;
5ab377df6d8b filtering on aet Sebastien Jodogne <s.jodogne@gmail.com> parents: 614 diff changeset	184 }
5ab377df6d8b filtering on aet Sebastien Jodogne <s.jodogne@gmail.com> parents: 614 diff changeset	185 }
1163 3db41779d8f9 abstraction to allow/prevent transfer syntaxes on AET basis Sebastien Jodogne <s.jodogne@gmail.com> parents: 1135 diff changeset	186
1164 0a55d8eb194e Configuration/Lua to select the accepted C-Store SCP transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1163 diff changeset	187 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	188 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	189 TransferSyntax syntax)
3db41779d8f9 abstraction to allow/prevent transfer syntaxes on AET basis Sebastien Jodogne <s.jodogne@gmail.com> parents: 1135 diff changeset	190 {
1164 0a55d8eb194e Configuration/Lua to select the accepted C-Store SCP transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1163 diff changeset	191 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	192
0a55d8eb194e Configuration/Lua to select the accepted C-Store SCP transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1163 diff changeset	193 switch (syntax)
0a55d8eb194e Configuration/Lua to select the accepted C-Store SCP transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1163 diff changeset	194 {
0a55d8eb194e Configuration/Lua to select the accepted C-Store SCP transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1163 diff changeset	195 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	196 configuration = "DeflatedTransferSyntaxAccepted";
0a55d8eb194e Configuration/Lua to select the accepted C-Store SCP transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1163 diff changeset	197 break;
0a55d8eb194e Configuration/Lua to select the accepted C-Store SCP transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1163 diff changeset	198
0a55d8eb194e Configuration/Lua to select the accepted C-Store SCP transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1163 diff changeset	199 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	200 configuration = "JpegTransferSyntaxAccepted";
0a55d8eb194e Configuration/Lua to select the accepted C-Store SCP transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1163 diff changeset	201 break;
0a55d8eb194e Configuration/Lua to select the accepted C-Store SCP transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1163 diff changeset	202
0a55d8eb194e Configuration/Lua to select the accepted C-Store SCP transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1163 diff changeset	203 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	204 configuration = "Jpeg2000TransferSyntaxAccepted";
0a55d8eb194e Configuration/Lua to select the accepted C-Store SCP transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1163 diff changeset	205 break;
0a55d8eb194e Configuration/Lua to select the accepted C-Store SCP transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1163 diff changeset	206
0a55d8eb194e Configuration/Lua to select the accepted C-Store SCP transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1163 diff changeset	207 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	208 configuration = "JpegLosslessTransferSyntaxAccepted";
0a55d8eb194e Configuration/Lua to select the accepted C-Store SCP transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1163 diff changeset	209 break;
0a55d8eb194e Configuration/Lua to select the accepted C-Store SCP transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1163 diff changeset	210
0a55d8eb194e Configuration/Lua to select the accepted C-Store SCP transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1163 diff changeset	211 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	212 configuration = "JpipTransferSyntaxAccepted";
0a55d8eb194e Configuration/Lua to select the accepted C-Store SCP transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1163 diff changeset	213 break;
0a55d8eb194e Configuration/Lua to select the accepted C-Store SCP transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1163 diff changeset	214
0a55d8eb194e Configuration/Lua to select the accepted C-Store SCP transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1163 diff changeset	215 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	216 configuration = "Mpeg2TransferSyntaxAccepted";
0a55d8eb194e Configuration/Lua to select the accepted C-Store SCP transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1163 diff changeset	217 break;
0a55d8eb194e Configuration/Lua to select the accepted C-Store SCP transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1163 diff changeset	218
0a55d8eb194e Configuration/Lua to select the accepted C-Store SCP transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1163 diff changeset	219 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	220 configuration = "RleTransferSyntaxAccepted";
0a55d8eb194e Configuration/Lua to select the accepted C-Store SCP transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1163 diff changeset	221 break;
0a55d8eb194e Configuration/Lua to select the accepted C-Store SCP transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1163 diff changeset	222
0a55d8eb194e Configuration/Lua to select the accepted C-Store SCP transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1163 diff changeset	223 default:
0a55d8eb194e Configuration/Lua to select the accepted C-Store SCP transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1163 diff changeset	224 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	225 }
0a55d8eb194e Configuration/Lua to select the accepted C-Store SCP transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1163 diff changeset	226
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 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	229
1433 461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	230 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	231
0a55d8eb194e Configuration/Lua to select the accepted C-Store SCP transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1163 diff changeset	232 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	233 {
0a55d8eb194e Configuration/Lua to select the accepted C-Store SCP transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1163 diff changeset	234 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	235 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	236 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	237 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	238 }
0a55d8eb194e Configuration/Lua to select the accepted C-Store SCP transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1163 diff changeset	239 }
0a55d8eb194e Configuration/Lua to select the accepted C-Store SCP transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1163 diff changeset	240
0a55d8eb194e Configuration/Lua to select the accepted C-Store SCP transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1163 diff changeset	241 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	242 }
618 5ab377df6d8b filtering on aet Sebastien Jodogne <s.jodogne@gmail.com> parents: 614 diff changeset	243 };
5ab377df6d8b filtering on aet Sebastien Jodogne <s.jodogne@gmail.com> parents: 614 diff changeset	244
5ab377df6d8b filtering on aet Sebastien Jodogne <s.jodogne@gmail.com> parents: 614 diff changeset	245
409 63f707278fc8 lua filtering of incoming http requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 407 diff changeset	246 class MyIncomingHttpRequestFilter : public IIncomingHttpRequestFilter
63f707278fc8 lua filtering of incoming http requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 407 diff changeset	247 {
63f707278fc8 lua filtering of incoming http requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 407 diff changeset	248 private:
63f707278fc8 lua filtering of incoming http requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 407 diff changeset	249 ServerContext& context_;
63f707278fc8 lua filtering of incoming http requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 407 diff changeset	250
63f707278fc8 lua filtering of incoming http requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 407 diff changeset	251 public:
63f707278fc8 lua filtering of incoming http requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 407 diff changeset	252 MyIncomingHttpRequestFilter(ServerContext& context) : context_(context)
63f707278fc8 lua filtering of incoming http requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 407 diff changeset	253 {
63f707278fc8 lua filtering of incoming http requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 407 diff changeset	254 }
63f707278fc8 lua filtering of incoming http requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 407 diff changeset	255
473 c9a5d72f8481 changing the namespace of HTTP enumerations Sebastien Jodogne <s.jodogne@gmail.com> parents: 426 diff changeset	256 virtual bool IsAllowed(HttpMethod method,
409 63f707278fc8 lua filtering of incoming http requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 407 diff changeset	257 const char* uri,
63f707278fc8 lua filtering of incoming http requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 407 diff changeset	258 const char* ip,
63f707278fc8 lua filtering of incoming http requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 407 diff changeset	259 const char* username) const
63f707278fc8 lua filtering of incoming http requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 407 diff changeset	260 {
63f707278fc8 lua filtering of incoming http requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 407 diff changeset	261 static const char* HTTP_FILTER = "IncomingHttpRequestFilter";
63f707278fc8 lua filtering of incoming http requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 407 diff changeset	262
1433 461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	263 LuaScripting::Locker locker(context_.GetLua());
996 cf52f3bcb2b3 clarification of Lua classes wrt multithreading Sebastien Jodogne <s.jodogne@gmail.com> parents: 941 diff changeset	264
409 63f707278fc8 lua filtering of incoming http requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 407 diff changeset	265 // 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	266 if (locker.GetLua().IsExistingFunction(HTTP_FILTER))
409 63f707278fc8 lua filtering of incoming http requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 407 diff changeset	267 {
996 cf52f3bcb2b3 clarification of Lua classes wrt multithreading Sebastien Jodogne <s.jodogne@gmail.com> parents: 941 diff changeset	268 LuaFunctionCall call(locker.GetLua(), HTTP_FILTER);
409 63f707278fc8 lua filtering of incoming http requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 407 diff changeset	269
63f707278fc8 lua filtering of incoming http requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 407 diff changeset	270 switch (method)
63f707278fc8 lua filtering of incoming http requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 407 diff changeset	271 {
473 c9a5d72f8481 changing the namespace of HTTP enumerations Sebastien Jodogne <s.jodogne@gmail.com> parents: 426 diff changeset	272 case HttpMethod_Get:
409 63f707278fc8 lua filtering of incoming http requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 407 diff changeset	273 call.PushString("GET");
63f707278fc8 lua filtering of incoming http requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 407 diff changeset	274 break;
63f707278fc8 lua filtering of incoming http requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 407 diff changeset	275
473 c9a5d72f8481 changing the namespace of HTTP enumerations Sebastien Jodogne <s.jodogne@gmail.com> parents: 426 diff changeset	276 case HttpMethod_Put:
409 63f707278fc8 lua filtering of incoming http requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 407 diff changeset	277 call.PushString("PUT");
63f707278fc8 lua filtering of incoming http requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 407 diff changeset	278 break;
63f707278fc8 lua filtering of incoming http requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 407 diff changeset	279
473 c9a5d72f8481 changing the namespace of HTTP enumerations Sebastien Jodogne <s.jodogne@gmail.com> parents: 426 diff changeset	280 case HttpMethod_Post:
409 63f707278fc8 lua filtering of incoming http requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 407 diff changeset	281 call.PushString("POST");
63f707278fc8 lua filtering of incoming http requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 407 diff changeset	282 break;
63f707278fc8 lua filtering of incoming http requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 407 diff changeset	283
473 c9a5d72f8481 changing the namespace of HTTP enumerations Sebastien Jodogne <s.jodogne@gmail.com> parents: 426 diff changeset	284 case HttpMethod_Delete:
409 63f707278fc8 lua filtering of incoming http requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 407 diff changeset	285 call.PushString("DELETE");
63f707278fc8 lua filtering of incoming http requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 407 diff changeset	286 break;
63f707278fc8 lua filtering of incoming http requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 407 diff changeset	287
63f707278fc8 lua filtering of incoming http requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 407 diff changeset	288 default:
63f707278fc8 lua filtering of incoming http requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 407 diff changeset	289 return true;
63f707278fc8 lua filtering of incoming http requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 407 diff changeset	290 }
63f707278fc8 lua filtering of incoming http requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 407 diff changeset	291
63f707278fc8 lua filtering of incoming http requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 407 diff changeset	292 call.PushString(uri);
63f707278fc8 lua filtering of incoming http requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 407 diff changeset	293 call.PushString(ip);
63f707278fc8 lua filtering of incoming http requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 407 diff changeset	294 call.PushString(username);
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 if (!call.ExecutePredicate())
63f707278fc8 lua filtering of incoming http requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 407 diff changeset	297 {
63f707278fc8 lua filtering of incoming http requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 407 diff changeset	298 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	299 return false;
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 }
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 return true;
63f707278fc8 lua filtering of incoming http requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 407 diff changeset	304 }
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
893 f57802f8b4dc plugins for windows Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	308 static void PrintHelp(char* path)
133 1969ff16457c help Sebastien Jodogne <s.jodogne@gmail.com> parents: 128 diff changeset	309 {
1969ff16457c help Sebastien Jodogne <s.jodogne@gmail.com> parents: 128 diff changeset	310 std::cout
1969ff16457c help Sebastien Jodogne <s.jodogne@gmail.com> parents: 128 diff changeset	311 << "Usage: " << path << " [OPTION]... [CONFIGURATION]" << std::endl
175 662af781a227 sample config file from command line Sebastien Jodogne <s.jodogne@gmail.com> parents: 158 diff changeset	312 << "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	313 << std::endl
175 662af781a227 sample config file from command line Sebastien Jodogne <s.jodogne@gmail.com> parents: 158 diff changeset	314 << "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	315 << "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	316 << "instructions about how to use Orthanc " << std::endl
133 1969ff16457c help Sebastien Jodogne <s.jodogne@gmail.com> parents: 128 diff changeset	317 << "<https://code.google.com/p/orthanc/wiki/OrthancCookbook>." << std::endl
1969ff16457c help Sebastien Jodogne <s.jodogne@gmail.com> parents: 128 diff changeset	318 << std::endl
1969ff16457c help Sebastien Jodogne <s.jodogne@gmail.com> parents: 128 diff changeset	319 << "Command-line options:" << std::endl
1969ff16457c help Sebastien Jodogne <s.jodogne@gmail.com> parents: 128 diff changeset	320 << " --help\t\tdisplay this help and exit" << std::endl
1969ff16457c help Sebastien Jodogne <s.jodogne@gmail.com> parents: 128 diff changeset	321 << " --logdir=[dir]\tdirectory where to store the log files" << std::endl
1969ff16457c help Sebastien Jodogne <s.jodogne@gmail.com> parents: 128 diff changeset	322 << "\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	323 << " --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	324 << " --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	325 << " --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	326 << " --version\t\toutput version information and exit" << std::endl
133 1969ff16457c help Sebastien Jodogne <s.jodogne@gmail.com> parents: 128 diff changeset	327 << std::endl
1969ff16457c help Sebastien Jodogne <s.jodogne@gmail.com> parents: 128 diff changeset	328 << "Exit status:" << std::endl
1969ff16457c help Sebastien Jodogne <s.jodogne@gmail.com> parents: 128 diff changeset	329 << " 0 if OK," << std::endl
1969ff16457c help Sebastien Jodogne <s.jodogne@gmail.com> parents: 128 diff changeset	330 << " -1 if error (have a look at the logs)." << std::endl
1969ff16457c help Sebastien Jodogne <s.jodogne@gmail.com> parents: 128 diff changeset	331 << std::endl;
1969ff16457c help Sebastien Jodogne <s.jodogne@gmail.com> parents: 128 diff changeset	332 }
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	333
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	334
893 f57802f8b4dc plugins for windows Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	335 static void PrintVersion(char* path)
133 1969ff16457c help Sebastien Jodogne <s.jodogne@gmail.com> parents: 128 diff changeset	336 {
1969ff16457c help Sebastien Jodogne <s.jodogne@gmail.com> parents: 128 diff changeset	337 std::cout
1969ff16457c help Sebastien Jodogne <s.jodogne@gmail.com> parents: 128 diff changeset	338 << path << " " << ORTHANC_VERSION << std::endl
1289 5810700b68fa upgrade to year 2015 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	339 << "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	340 << "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	341 << "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	342 << "There is NO WARRANTY, to the extent permitted by law." << std::endl
1969ff16457c help Sebastien Jodogne <s.jodogne@gmail.com> parents: 128 diff changeset	343 << std::endl
1969ff16457c help Sebastien Jodogne <s.jodogne@gmail.com> parents: 128 diff changeset	344 << "Written by Sebastien Jodogne <s.jodogne@gmail.com>" << std::endl;
1969ff16457c help Sebastien Jodogne <s.jodogne@gmail.com> parents: 128 diff changeset	345 }
1969ff16457c help Sebastien Jodogne <s.jodogne@gmail.com> parents: 128 diff changeset	346
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	347
893 f57802f8b4dc plugins for windows Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	348
f57802f8b4dc plugins for windows Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	349 static void LoadLuaScripts(ServerContext& context)
f57802f8b4dc plugins for windows Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	350 {
f57802f8b4dc plugins for windows Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	351 std::list<std::string> luaScripts;
f57802f8b4dc plugins for windows Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	352 Configuration::GetGlobalListOfStringsParameter(luaScripts, "LuaScripts");
f57802f8b4dc plugins for windows Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	353 for (std::list<std::string>::const_iterator
f57802f8b4dc plugins for windows Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	354 it = luaScripts.begin(); it != luaScripts.end(); ++it)
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::string path = Configuration::InterpretStringParameterAsPath(*it);
f57802f8b4dc plugins for windows Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	357 LOG(WARNING) << "Installing the Lua scripts from: " << path;
f57802f8b4dc plugins for windows Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	358 std::string script;
f57802f8b4dc plugins for windows Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	359 Toolbox::ReadFile(script, path);
1018 564e39d6df13 integration mainline->lua-scripting Sebastien Jodogne <s.jodogne@gmail.com> parents: 1005 943 diff changeset	360
1433 461e7554bff7 refactoring: LuaScripting Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	361 LuaScripting::Locker locker(context.GetLua());
1018 564e39d6df13 integration mainline->lua-scripting Sebastien Jodogne <s.jodogne@gmail.com> parents: 1005 943 diff changeset	362 locker.GetLua().Execute(script);
893 f57802f8b4dc plugins for windows Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	363 }
f57802f8b4dc plugins for windows Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	364 }
f57802f8b4dc plugins for windows Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	365
f57802f8b4dc plugins for windows Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	366
1434 f9cd40166269 refactoring of OrthancPlugins, improvement in ServeFolders Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	367 static void LoadPlugins(OrthancPlugins& plugins)
893 f57802f8b4dc plugins for windows Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	368 {
1434 f9cd40166269 refactoring of OrthancPlugins, improvement in ServeFolders Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	369 std::list<std::string> path;
f9cd40166269 refactoring of OrthancPlugins, improvement in ServeFolders Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	370 Configuration::GetGlobalListOfStringsParameter(path, "Plugins");
893 f57802f8b4dc plugins for windows Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	371 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	372 it = path.begin(); it != path.end(); ++it)
893 f57802f8b4dc plugins for windows Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	373 {
f57802f8b4dc plugins for windows Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	374 std::string path = Configuration::InterpretStringParameterAsPath(*it);
1321 0f9e0e808e0f more explicit message Sebastien Jodogne <s.jodogne@gmail.com> parents: 1310 diff changeset	375 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	376 plugins.GetManager().RegisterPlugin(path);
893 f57802f8b4dc plugins for windows Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	377 }
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
f57802f8b4dc plugins for windows Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	380
f57802f8b4dc plugins for windows Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	381
1452 b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	382 // Returns "true" if restart is required
b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	383 static bool WaitForExit(ServerContext& context,
b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	384 OrthancRestApi& restApi)
b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	385 {
b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	386 LOG(WARNING) << "Orthanc has started";
b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	387
1455 a68545767975 Initialize() and Finalize() events in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1452 diff changeset	388 context.GetLua().Execute("Initialize");
a68545767975 Initialize() and Finalize() events in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1452 diff changeset	389
1452 b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	390 Toolbox::ServerBarrier(restApi.ResetRequestReceivedFlag());
b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	391 bool restart = restApi.ResetRequestReceivedFlag();
b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	392
1455 a68545767975 Initialize() and Finalize() events in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1452 diff changeset	393 context.GetLua().Execute("Finalize");
a68545767975 Initialize() and Finalize() events in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1452 diff changeset	394
1452 b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	395 if (restart)
b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	396 {
b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	397 LOG(WARNING) << "Reset request received, restarting Orthanc";
b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	398 }
b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	399
b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	400 // We're done
b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	401 LOG(WARNING) << "Orthanc is stopping";
b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	402
b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	403 return restart;
b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	404 }
b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	405
1368 b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1366 diff changeset	406
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1366 diff changeset	407
1452 b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	408 static bool StartHttpServer(ServerContext& context,
b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	409 OrthancRestApi& restApi)
1103 bec1eccf976c Hot restart of Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 1102 diff changeset	410 {
1452 b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	411 if (!Configuration::GetGlobalBoolParameter("HttpServerEnabled", true))
b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	412 {
b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	413 LOG(WARNING) << "The HTTP server is disabled";
b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	414 return WaitForExit(context, restApi);
b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	415 }
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1245 diff changeset	416
1452 b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	417 // HTTP server
b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	418 MyIncomingHttpRequestFilter httpFilter(context);
b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	419 MongooseServer httpServer;
b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	420 httpServer.SetPortNumber(Configuration::GetGlobalIntegerParameter("HttpPort", 8042));
b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	421 httpServer.SetRemoteAccessAllowed(Configuration::GetGlobalBoolParameter("RemoteAccessAllowed", false));
b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	422 httpServer.SetKeepAliveEnabled(Configuration::GetGlobalBoolParameter("KeepAlive", false));
1517 4f8c8ef114db cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1490 diff changeset	423 httpServer.SetHttpCompressionEnabled(Configuration::GetGlobalBoolParameter("HttpCompressionEnabled", true));
1452 b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	424 httpServer.SetIncomingHttpRequestFilter(httpFilter);
1127 f4e65808ea58 FilesystemStorageWithoutDicom Sebastien Jodogne <s.jodogne@gmail.com> parents: 1124 diff changeset	425
1452 b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	426 httpServer.SetAuthenticationEnabled(Configuration::GetGlobalBoolParameter("AuthenticationEnabled", false));
b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	427 Configuration::SetupRegisteredUsers(httpServer);
b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	428
b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	429 if (Configuration::GetGlobalBoolParameter("SslEnabled", false))
1310 61ce8147f30d custom database back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1289 diff changeset	430 {
1452 b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	431 std::string certificate = Configuration::InterpretStringParameterAsPath(
b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	432 Configuration::GetGlobalStringParameter("SslCertificate", "certificate.pem"));
b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	433 httpServer.SetSslEnabled(true);
b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	434 httpServer.SetSslCertificate(certificate.c_str());
1310 61ce8147f30d custom database back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1289 diff changeset	435 }
61ce8147f30d custom database back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1289 diff changeset	436 else
61ce8147f30d custom database back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1289 diff changeset	437 {
1452 b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	438 httpServer.SetSslEnabled(false);
1310 61ce8147f30d custom database back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1289 diff changeset	439 }
1103 bec1eccf976c Hot restart of Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 1102 diff changeset	440
1452 b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	441 httpServer.Register(context.GetHttpHandler());
1310 61ce8147f30d custom database back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1289 diff changeset	442
1452 b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	443 httpServer.Start();
b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	444 LOG(WARNING) << "HTTP server listening on port: " << httpServer.GetPortNumber();
b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	445
b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	446 bool restart = WaitForExit(context, restApi);
b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	447
b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	448 httpServer.Stop();
b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	449 LOG(WARNING) << " HTTP server has stopped";
1103 bec1eccf976c Hot restart of Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 1102 diff changeset	450
1452 b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	451 return restart;
b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	452 }
b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	453
b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	454
b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	455 static bool StartDicomServer(ServerContext& context,
b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	456 OrthancRestApi& restApi)
b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	457 {
b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	458 if (!Configuration::GetGlobalBoolParameter("DicomServerEnabled", true))
1103 bec1eccf976c Hot restart of Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 1102 diff changeset	459 {
1452 b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	460 LOG(WARNING) << "The DICOM server is disabled";
b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	461 return StartHttpServer(context, restApi);
1103 bec1eccf976c Hot restart of Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 1102 diff changeset	462 }
bec1eccf976c Hot restart of Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 1102 diff changeset	463
1452 b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	464 MyDicomServerFactory serverFactory(context);
b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	465
b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	466 // DICOM server
b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	467 DicomServer dicomServer;
b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	468 OrthancApplicationEntityFilter dicomFilter(context);
b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	469 dicomServer.SetCalledApplicationEntityTitleCheck(Configuration::GetGlobalBoolParameter("DicomCheckCalledAet", false));
b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	470 dicomServer.SetStoreRequestHandlerFactory(serverFactory);
b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	471 dicomServer.SetMoveRequestHandlerFactory(serverFactory);
b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	472 dicomServer.SetFindRequestHandlerFactory(serverFactory);
b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	473 dicomServer.SetPortNumber(Configuration::GetGlobalIntegerParameter("DicomPort", 4242));
b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	474 dicomServer.SetApplicationEntityTitle(Configuration::GetGlobalStringParameter("DicomAet", "ORTHANC"));
b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	475 dicomServer.SetApplicationEntityFilter(dicomFilter);
b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	476
b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	477 dicomServer.Start();
b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	478 LOG(WARNING) << "DICOM server listening on port: " << dicomServer.GetPortNumber();
b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	479
b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	480 bool restart = StartHttpServer(context, restApi);
b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	481
b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	482 dicomServer.Stop();
b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	483 LOG(WARNING) << " DICOM server has stopped";
b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	484
b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	485 serverFactory.Done();
b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	486
b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	487 return restart;
b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	488 }
b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	489
b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	490
b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	491 static bool ConfigureHttpHandler(ServerContext& context,
b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	492 OrthancPlugins *plugins)
b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	493 {
b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	494 // By order of priority, first apply the "plugins" layer, so that
b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	495 // plugins can overwrite the built-in REST API of Orthanc
b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	496 if (plugins)
1103 bec1eccf976c Hot restart of Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 1102 diff changeset	497 {
1452 b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	498 assert(context.HasPlugins());
b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	499 context.GetHttpHandler().Register(*plugins, false);
1103 bec1eccf976c Hot restart of Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 1102 diff changeset	500 }
bec1eccf976c Hot restart of Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 1102 diff changeset	501
1452 b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	502 // Secondly, apply the "static resources" layer
1443 895ab369d63c refactoring: OrthancHttpHandler Sebastien Jodogne <s.jodogne@gmail.com> parents: 1437 diff changeset	503 #if ORTHANC_STANDALONE == 1
895ab369d63c refactoring: OrthancHttpHandler Sebastien Jodogne <s.jodogne@gmail.com> parents: 1437 diff changeset	504 EmbeddedResourceHttpHandler staticResources("/app", EmbeddedResources::ORTHANC_EXPLORER);
895ab369d63c refactoring: OrthancHttpHandler Sebastien Jodogne <s.jodogne@gmail.com> parents: 1437 diff changeset	505 #else
895ab369d63c refactoring: OrthancHttpHandler Sebastien Jodogne <s.jodogne@gmail.com> parents: 1437 diff changeset	506 FilesystemHttpHandler staticResources("/app", ORTHANC_PATH "/OrthancExplorer");
895ab369d63c refactoring: OrthancHttpHandler Sebastien Jodogne <s.jodogne@gmail.com> parents: 1437 diff changeset	507 #endif
895ab369d63c refactoring: OrthancHttpHandler Sebastien Jodogne <s.jodogne@gmail.com> parents: 1437 diff changeset	508
1452 b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	509 context.GetHttpHandler().Register(staticResources, false);
1135 67c3c1e4a6e0 index-only mode, and custom storage area with plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1134 diff changeset	510
1452 b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	511 // Thirdly, consider the built-in REST API of Orthanc
b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	512 OrthancRestApi restApi(context);
b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	513 context.GetHttpHandler().Register(restApi, true);
1103 bec1eccf976c Hot restart of Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 1102 diff changeset	514
1452 b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	515 return StartDicomServer(context, restApi);
1103 bec1eccf976c Hot restart of Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 1102 diff changeset	516 }
bec1eccf976c Hot restart of Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 1102 diff changeset	517
bec1eccf976c Hot restart of Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 1102 diff changeset	518
1452 b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	519 static bool ConfigureServerContext(IDatabaseWrapper& database,
b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	520 IStorageArea& storageArea,
b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	521 OrthancPlugins *plugins)
b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	522 {
1549 e5e975e9b738 refactoring and simplification of StorageAccessor Sebastien Jodogne <s.jodogne@gmail.com> parents: 1517 diff changeset	523 ServerContext context(database, storageArea);
1452 b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	524
b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	525 context.SetCompressionEnabled(Configuration::GetGlobalBoolParameter("StorageCompression", false));
b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	526 context.SetStoreMD5ForAttachments(Configuration::GetGlobalBoolParameter("StoreMD5ForAttachments", true));
b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	527
b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	528 try
b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	529 {
b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	530 context.GetIndex().SetMaximumPatientCount(Configuration::GetGlobalIntegerParameter("MaximumPatientCount", 0));
b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	531 }
b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	532 catch (...)
b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	533 {
b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	534 context.GetIndex().SetMaximumPatientCount(0);
b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	535 }
b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	536
b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	537 try
b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	538 {
b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	539 uint64_t size = Configuration::GetGlobalIntegerParameter("MaximumStorageSize", 0);
b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	540 context.GetIndex().SetMaximumStorageSize(size * 1024 * 1024);
b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	541 }
b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	542 catch (...)
b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	543 {
b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	544 context.GetIndex().SetMaximumStorageSize(0);
b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	545 }
b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	546
b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	547 LoadLuaScripts(context);
b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	548
b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	549 if (plugins)
b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	550 {
b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	551 plugins->SetServerContext(context);
b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	552 context.SetPlugins(*plugins);
b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	553 }
b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	554
b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	555 bool restart = ConfigureHttpHandler(context, plugins);
b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	556 context.Stop();
b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	557
b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	558 if (plugins)
b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	559 {
b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	560 context.ResetPlugins();
b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	561 }
b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	562
b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	563 return restart;
b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	564 }
b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	565
b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	566
b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	567 static bool ConfigurePlugins(int argc,
b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	568 char* argv[])
b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	569 {
b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	570 std::auto_ptr<IDatabaseWrapper> databasePtr;
b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	571 std::auto_ptr<IStorageArea> storage;
b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	572
1455 a68545767975 Initialize() and Finalize() events in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1452 diff changeset	573 #if ORTHANC_PLUGINS_ENABLED == 1
1452 b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	574 OrthancPlugins plugins;
b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	575 plugins.SetCommandLineArguments(argc, argv);
b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	576 LoadPlugins(plugins);
b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	577
b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	578 IDatabaseWrapper* database = NULL;
b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	579 if (plugins.HasDatabase())
b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	580 {
b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	581 LOG(WARNING) << "Using a custom database from plugins";
b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	582 database = &plugins.GetDatabase();
b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	583 }
b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	584 else
b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	585 {
b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	586 databasePtr.reset(Configuration::CreateDatabaseWrapper());
b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	587 database = databasePtr.get();
b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	588 }
b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	589
b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	590 if (plugins.HasStorageArea())
b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	591 {
b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	592 LOG(WARNING) << "Using a custom storage area from plugins";
b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	593 storage.reset(plugins.CreateStorageArea());
b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	594 }
b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	595 else
b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	596 {
b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	597 storage.reset(Configuration::CreateStorageArea());
b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	598 }
b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	599
b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	600 assert(database != NULL);
b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	601 assert(storage.get() != NULL);
b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	602
b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	603 return ConfigureServerContext(database, storage, &plugins);
b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	604
1455 a68545767975 Initialize() and Finalize() events in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1452 diff changeset	605 #elif ORTHANC_PLUGINS_ENABLED == 0
1452 b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	606 // The plugins are disabled
b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	607 databasePtr.reset(Configuration::CreateDatabaseWrapper());
b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	608 storage.reset(Configuration::CreateStorageArea());
b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	609
b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	610 return ConfigureServerContext(databasePtr, storage, NULL);
1455 a68545767975 Initialize() and Finalize() events in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1452 diff changeset	611
a68545767975 Initialize() and Finalize() events in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1452 diff changeset	612 #else
a68545767975 Initialize() and Finalize() events in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1452 diff changeset	613 # error The macro ORTHANC_PLUGINS_ENABLED must be set to 0 or 1
1452 b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	614 #endif
b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	615 }
b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	616
b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	617
b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	618 static bool StartOrthanc(int argc, char* argv[])
b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	619 {
b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	620 return ConfigurePlugins(argc, argv);
b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	621 }
1103 bec1eccf976c Hot restart of Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 1102 diff changeset	622
893 f57802f8b4dc plugins for windows Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	623
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	624 int main(int argc, char* argv[])
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	625 {
1485 27661b33f624 Creation of Logging.h Sebastien Jodogne <s.jodogne@gmail.com> parents: 1455 diff changeset	626 Logging::Initialize();
133 1969ff16457c help Sebastien Jodogne <s.jodogne@gmail.com> parents: 128 diff changeset	627
112 80ca409f232f logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 108 diff changeset	628 for (int i = 1; i < argc; i++)
80ca409f232f logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 108 diff changeset	629 {
133 1969ff16457c help Sebastien Jodogne <s.jodogne@gmail.com> parents: 128 diff changeset	630 if (std::string(argv[i]) == "--help")
1969ff16457c help Sebastien Jodogne <s.jodogne@gmail.com> parents: 128 diff changeset	631 {
1969ff16457c help Sebastien Jodogne <s.jodogne@gmail.com> parents: 128 diff changeset	632 PrintHelp(argv[0]);
1969ff16457c help Sebastien Jodogne <s.jodogne@gmail.com> parents: 128 diff changeset	633 return 0;
1969ff16457c help Sebastien Jodogne <s.jodogne@gmail.com> parents: 128 diff changeset	634 }
1969ff16457c help Sebastien Jodogne <s.jodogne@gmail.com> parents: 128 diff changeset	635
1969ff16457c help Sebastien Jodogne <s.jodogne@gmail.com> parents: 128 diff changeset	636 if (std::string(argv[i]) == "--version")
1969ff16457c help Sebastien Jodogne <s.jodogne@gmail.com> parents: 128 diff changeset	637 {
1969ff16457c help Sebastien Jodogne <s.jodogne@gmail.com> parents: 128 diff changeset	638 PrintVersion(argv[0]);
1969ff16457c help Sebastien Jodogne <s.jodogne@gmail.com> parents: 128 diff changeset	639 return 0;
1969ff16457c help Sebastien Jodogne <s.jodogne@gmail.com> parents: 128 diff changeset	640 }
1969ff16457c help Sebastien Jodogne <s.jodogne@gmail.com> parents: 128 diff changeset	641
137 0e97abc7b950 fix of a bug in older versions of sqlite Sebastien Jodogne <s.jodogne@gmail.com> parents: 136 diff changeset	642 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	643 {
1485 27661b33f624 Creation of Logging.h Sebastien Jodogne <s.jodogne@gmail.com> parents: 1455 diff changeset	644 Logging::EnableInfoLevel(true);
137 0e97abc7b950 fix of a bug in older versions of sqlite Sebastien Jodogne <s.jodogne@gmail.com> parents: 136 diff changeset	645 }
0e97abc7b950 fix of a bug in older versions of sqlite Sebastien Jodogne <s.jodogne@gmail.com> parents: 136 diff changeset	646
0e97abc7b950 fix of a bug in older versions of sqlite Sebastien Jodogne <s.jodogne@gmail.com> parents: 136 diff changeset	647 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	648 {
1485 27661b33f624 Creation of Logging.h Sebastien Jodogne <s.jodogne@gmail.com> parents: 1455 diff changeset	649 Logging::EnableTraceLevel(true);
137 0e97abc7b950 fix of a bug in older versions of sqlite Sebastien Jodogne <s.jodogne@gmail.com> parents: 136 diff changeset	650 }
0e97abc7b950 fix of a bug in older versions of sqlite Sebastien Jodogne <s.jodogne@gmail.com> parents: 136 diff changeset	651
112 80ca409f232f logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 108 diff changeset	652 if (boost::starts_with(argv[i], "--logdir="))
80ca409f232f logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 108 diff changeset	653 {
1490 596927722403 support of --logdir by the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1489 diff changeset	654 std::string directory = std::string(argv[i]).substr(9);
596927722403 support of --logdir by the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1489 diff changeset	655
596927722403 support of --logdir by the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1489 diff changeset	656 try
596927722403 support of --logdir by the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1489 diff changeset	657 {
596927722403 support of --logdir by the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1489 diff changeset	658 Logging::SetTargetFolder(directory);
596927722403 support of --logdir by the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1489 diff changeset	659 }
596927722403 support of --logdir by the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1489 diff changeset	660 catch (OrthancException&)
596927722403 support of --logdir by the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1489 diff changeset	661 {
596927722403 support of --logdir by the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1489 diff changeset	662 fprintf(stderr, "The directory where to store the log files (%s) is inexistent, aborting.\n", directory.c_str());
596927722403 support of --logdir by the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1489 diff changeset	663 return -1;
596927722403 support of --logdir by the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1489 diff changeset	664 }
112 80ca409f232f logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 108 diff changeset	665 }
175 662af781a227 sample config file from command line Sebastien Jodogne <s.jodogne@gmail.com> parents: 158 diff changeset	666
662af781a227 sample config file from command line Sebastien Jodogne <s.jodogne@gmail.com> parents: 158 diff changeset	667 if (boost::starts_with(argv[i], "--config="))
662af781a227 sample config file from command line Sebastien Jodogne <s.jodogne@gmail.com> parents: 158 diff changeset	668 {
662af781a227 sample config file from command line Sebastien Jodogne <s.jodogne@gmail.com> parents: 158 diff changeset	669 std::string configurationSample;
662af781a227 sample config file from command line Sebastien Jodogne <s.jodogne@gmail.com> parents: 158 diff changeset	670 GetFileResource(configurationSample, EmbeddedResources::CONFIGURATION_SAMPLE);
662af781a227 sample config file from command line Sebastien Jodogne <s.jodogne@gmail.com> parents: 158 diff changeset	671
684 96d8410c56cd newlines Sebastien Jodogne <s.jodogne@gmail.com> parents: 657 diff changeset	672 #if defined(_WIN32)
96d8410c56cd newlines Sebastien Jodogne <s.jodogne@gmail.com> parents: 657 diff changeset	673 // Replace UNIX newlines with DOS newlines
96d8410c56cd newlines Sebastien Jodogne <s.jodogne@gmail.com> parents: 657 diff changeset	674 boost::replace_all(configurationSample, "\n", "\r\n");
96d8410c56cd newlines Sebastien Jodogne <s.jodogne@gmail.com> parents: 657 diff changeset	675 #endif
96d8410c56cd newlines Sebastien Jodogne <s.jodogne@gmail.com> parents: 657 diff changeset	676
175 662af781a227 sample config file from command line Sebastien Jodogne <s.jodogne@gmail.com> parents: 158 diff changeset	677 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	678 std::ofstream f(target.c_str());
662af781a227 sample config file from command line Sebastien Jodogne <s.jodogne@gmail.com> parents: 158 diff changeset	679 f << configurationSample;
662af781a227 sample config file from command line Sebastien Jodogne <s.jodogne@gmail.com> parents: 158 diff changeset	680 f.close();
662af781a227 sample config file from command line Sebastien Jodogne <s.jodogne@gmail.com> parents: 158 diff changeset	681 return 0;
662af781a227 sample config file from command line Sebastien Jodogne <s.jodogne@gmail.com> parents: 158 diff changeset	682 }
112 80ca409f232f logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 108 diff changeset	683 }
80ca409f232f logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 108 diff changeset	684
1102 ce6386b37afd avoid unnecessary exceptions on Orthanc startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1066 diff changeset	685 const char* configurationFile = NULL;
ce6386b37afd avoid unnecessary exceptions on Orthanc startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1066 diff changeset	686 for (int i = 1; i < argc; i++)
ce6386b37afd avoid unnecessary exceptions on Orthanc startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1066 diff changeset	687 {
ce6386b37afd avoid unnecessary exceptions on Orthanc startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1066 diff changeset	688 // 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	689 // the configuration file
ce6386b37afd avoid unnecessary exceptions on Orthanc startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1066 diff changeset	690 if (argv[i][0] != '-')
ce6386b37afd avoid unnecessary exceptions on Orthanc startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1066 diff changeset	691 {
ce6386b37afd avoid unnecessary exceptions on Orthanc startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1066 diff changeset	692 configurationFile = argv[i];
ce6386b37afd avoid unnecessary exceptions on Orthanc startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1066 diff changeset	693 }
ce6386b37afd avoid unnecessary exceptions on Orthanc startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1066 diff changeset	694 }
ce6386b37afd avoid unnecessary exceptions on Orthanc startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1066 diff changeset	695
1171 fd3128b2cf45 log version on startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1164 diff changeset	696 LOG(WARNING) << "Orthanc version: " << ORTHANC_VERSION;
1102 ce6386b37afd avoid unnecessary exceptions on Orthanc startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1066 diff changeset	697
291 4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 270 diff changeset	698 int status = 0;
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	699 try
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	700 {
1103 bec1eccf976c Hot restart of Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 1102 diff changeset	701 for (;;)
270 e6a4c4329481 parameters for storage capacity Sebastien Jodogne <s.jodogne@gmail.com> parents: 236 diff changeset	702 {
1103 bec1eccf976c Hot restart of Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 1102 diff changeset	703 OrthancInitialize(configurationFile);
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	704
1452 b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	705 bool restart = StartOrthanc(argc, argv);
b737acb13da5 refactoring of the main function Sebastien Jodogne <s.jodogne@gmail.com> parents: 1447 diff changeset	706 if (restart)
23 62bd05fe4b7c support for ssl Sebastien Jodogne <s.jodogne@gmail.com> parents: 19 diff changeset	707 {
1103 bec1eccf976c Hot restart of Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 1102 diff changeset	708 OrthancFinalize();
23 62bd05fe4b7c support for ssl Sebastien Jodogne <s.jodogne@gmail.com> parents: 19 diff changeset	709 }
62bd05fe4b7c support for ssl Sebastien Jodogne <s.jodogne@gmail.com> parents: 19 diff changeset	710 else
62bd05fe4b7c support for ssl Sebastien Jodogne <s.jodogne@gmail.com> parents: 19 diff changeset	711 {
1103 bec1eccf976c Hot restart of Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 1102 diff changeset	712 break;
23 62bd05fe4b7c support for ssl Sebastien Jodogne <s.jodogne@gmail.com> parents: 19 diff changeset	713 }
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	714 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	715 }
1245 aea9277dee75 catch more exceptions (patch from Valdas Rapsevicius) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1232 diff changeset	716 catch (const OrthancException& e)
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	717 {
1103 bec1eccf976c Hot restart of Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 1102 diff changeset	718 LOG(ERROR) << "Uncaught exception, stopping now: [" << e.What() << "]";
291 4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 270 diff changeset	719 status = -1;
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 270 diff changeset	720 }
1245 aea9277dee75 catch more exceptions (patch from Valdas Rapsevicius) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1232 diff changeset	721 catch (const std::exception& e)
aea9277dee75 catch more exceptions (patch from Valdas Rapsevicius) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1232 diff changeset	722 {
aea9277dee75 catch more exceptions (patch from Valdas Rapsevicius) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1232 diff changeset	723 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	724 status = -1;
aea9277dee75 catch more exceptions (patch from Valdas Rapsevicius) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1232 diff changeset	725 }
aea9277dee75 catch more exceptions (patch from Valdas Rapsevicius) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1232 diff changeset	726 catch (const std::string& s)
aea9277dee75 catch more exceptions (patch from Valdas Rapsevicius) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1232 diff changeset	727 {
aea9277dee75 catch more exceptions (patch from Valdas Rapsevicius) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1232 diff changeset	728 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	729 status = -1;
aea9277dee75 catch more exceptions (patch from Valdas Rapsevicius) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1232 diff changeset	730 }
291 4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 270 diff changeset	731 catch (...)
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 270 diff changeset	732 {
1223 5bd4c9f85b4c fix race condition while unregistering plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1210 diff changeset	733 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	734 status = -1;
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	735 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	736
62 a70bb32802ae renaming Server Sebastien Jodogne <s.jodogne@gmail.com> parents: 57 diff changeset	737 OrthancFinalize();
27 cfe212a513c5 openssl with visual studio Administrator@jodogne-w01 parents: 26 diff changeset	738
690 2e67366aab83 case-insensitive matching of Application Entity Titles Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	739 LOG(WARNING) << "Orthanc has stopped";
2e67366aab83 case-insensitive matching of Application Entity Titles Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	740
1485 27661b33f624 Creation of Logging.h Sebastien Jodogne <s.jodogne@gmail.com> parents: 1455 diff changeset	741 Logging::Finalize();
27661b33f624 Creation of Logging.h Sebastien Jodogne <s.jodogne@gmail.com> parents: 1455 diff changeset	742
291 4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 270 diff changeset	743 return status;
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	744 }

Mercurial > hg > orthanc

annotate OrthancServer/main.cpp @ 1572:904096e7367e