Mercurial > hg > orthanc
annotate OrthancServer/main.cpp @ 2637:5094369664f0
Avoid unnecessary calls to the database if there is no Lua callback
| author | Sebastien Jodogne <s.jodogne@gmail.com> |
|---|---|
| date | Mon, 28 May 2018 10:54:59 +0200 |
| parents | 40c7926b75f8 |
| children | 33c0b4da8cb2 52217dc47a4e |
| rev | line source |
|---|---|
| 0 | 1 /** |
| 62 | 2 * Orthanc - A Lightweight, RESTful DICOM Store |
| 1900 | 3 * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics |
|
1288
6e7e5ed91c2d
upgrade to year 2015
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1285
diff
changeset
|
4 * Department, University Hospital of Liege, Belgium |
|
2447
878b59270859
upgrade to year 2018
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2382
diff
changeset
|
5 * Copyright (C) 2017-2018 Osimis S.A., Belgium |
| 0 | 6 * |
| 7 * This program is free software: you can redistribute it and/or | |
| 8 * modify it under the terms of the GNU General Public License as | |
| 9 * published by the Free Software Foundation, either version 3 of the | |
| 10 * License, or (at your option) any later version. | |
| 136 | 11 * |
| 12 * In addition, as a special exception, the copyright holders of this | |
| 13 * program give permission to link the code of its release with the | |
| 14 * OpenSSL project's "OpenSSL" library (or with modified versions of it | |
| 15 * that use the same license as the "OpenSSL" library), and distribute | |
| 16 * the linked executables. You must obey the GNU General Public License | |
| 17 * in all respects for all of the code used other than "OpenSSL". If you | |
| 18 * modify file(s) with this exception, you may extend this exception to | |
| 19 * your version of the file(s), but you are not obligated to do so. If | |
| 20 * you do not wish to do so, delete this exception statement from your | |
| 21 * version. If you delete this exception statement from all source files | |
| 22 * in the program, then also delete it here. | |
| 0 | 23 * |
| 24 * This program is distributed in the hope that it will be useful, but | |
| 25 * WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 26 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
| 27 * General Public License for more details. | |
| 28 * | |
| 29 * You should have received a copy of the GNU General Public License | |
| 30 * along with this program. If not, see <http://www.gnu.org/licenses/>. | |
| 31 **/ | |
| 32 | |
| 33 | |
|
831
84513f2ee1f3
pch for unit tests and server
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
824
diff
changeset
|
34 #include "PrecompiledHeadersServer.h" |
| 750 | 35 #include "OrthancRestApi/OrthancRestApi.h" |
| 0 | 36 |
| 112 | 37 #include <boost/algorithm/string/predicate.hpp> |
| 0 | 38 |
|
1485
27661b33f624
Creation of Logging.h
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1455
diff
changeset
|
39 #include "../Core/Logging.h" |
| 0 | 40 #include "../Core/HttpServer/EmbeddedResourceHttpHandler.h" |
| 41 #include "../Core/HttpServer/FilesystemHttpHandler.h" | |
|
388
466c992a9a42
testing filters inside orthanc
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
376
diff
changeset
|
42 #include "../Core/Lua/LuaFunctionCall.h" |
|
387
ff647eedfbe1
enabling of Find/Move commands
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
376
diff
changeset
|
43 #include "../Core/DicomFormat/DicomArray.h" |
|
2382
7284093111b0
big reorganization to cleanly separate framework vs. server
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2381
diff
changeset
|
44 #include "../Core/DicomNetworking/DicomServer.h" |
|
7284093111b0
big reorganization to cleanly separate framework vs. server
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2381
diff
changeset
|
45 #include "../Core/DicomNetworking/ReusableDicomUserConnection.h" |
| 62 | 46 #include "OrthancInitialization.h" |
|
224
4eb0c7ce86c9
refactoring for store
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
210
diff
changeset
|
47 #include "ServerContext.h" |
|
565
c931ac02db82
refactoring of find class
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
559
diff
changeset
|
48 #include "OrthancFindRequestHandler.h" |
| 619 | 49 #include "OrthancMoveRequestHandler.h" |
|
730
309e686b41e7
better logging about nonexistent tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
725
diff
changeset
|
50 #include "ServerToolbox.h" |
| 1132 | 51 #include "../Plugins/Engine/OrthancPlugins.h" |
|
2382
7284093111b0
big reorganization to cleanly separate framework vs. server
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2381
diff
changeset
|
52 #include "../Core/DicomParsing/FromDcmtkBridge.h" |
| 0 | 53 |
| 62 | 54 using namespace Orthanc; |
| 0 | 55 |
| 56 | |
| 613 | 57 class OrthancStoreRequestHandler : public IStoreRequestHandler |
| 0 | 58 { |
| 59 private: | |
|
388
466c992a9a42
testing filters inside orthanc
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
376
diff
changeset
|
60 ServerContext& server_; |
| 0 | 61 |
| 62 public: | |
| 613 | 63 OrthancStoreRequestHandler(ServerContext& context) : |
|
388
466c992a9a42
testing filters inside orthanc
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
376
diff
changeset
|
64 server_(context) |
| 0 | 65 { |
| 66 } | |
| 67 | |
|
1573
3309878b3e16
more information about the origin of requests submitted to the DICOM handlers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1572
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 | 70 const DicomMap& dicomSummary, |
| 71 const Json::Value& dicomJson, | |
|
1573
3309878b3e16
more information about the origin of requests submitted to the DICOM handlers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1572
diff
changeset
|
72 const std::string& remoteIp, |
|
1285
5730f374e4e6
Access to called AET and remote AET from Lua scripts
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1280
diff
changeset
|
73 const std::string& remoteAet, |
|
1573
3309878b3e16
more information about the origin of requests submitted to the DICOM handlers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1572
diff
changeset
|
74 const std::string& calledAet) |
| 0 | 75 { |
| 76 if (dicomFile.size() > 0) | |
| 77 { | |
|
1005
84b6d7bca6db
refactoring of ServerContext::Store
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
996
diff
changeset
|
78 DicomInstanceToStore toStore; |
|
1573
3309878b3e16
more information about the origin of requests submitted to the DICOM handlers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1572
diff
changeset
|
79 toStore.SetDicomProtocolOrigin(remoteIp.c_str(), remoteAet.c_str(), calledAet.c_str()); |
|
1005
84b6d7bca6db
refactoring of ServerContext::Store
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
996
diff
changeset
|
80 toStore.SetBuffer(dicomFile); |
|
84b6d7bca6db
refactoring of ServerContext::Store
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
996
diff
changeset
|
81 toStore.SetSummary(dicomSummary); |
|
84b6d7bca6db
refactoring of ServerContext::Store
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
996
diff
changeset
|
82 toStore.SetJson(dicomJson); |
|
84b6d7bca6db
refactoring of ServerContext::Store
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
996
diff
changeset
|
83 |
|
84b6d7bca6db
refactoring of ServerContext::Store
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
996
diff
changeset
|
84 std::string id; |
|
84b6d7bca6db
refactoring of ServerContext::Store
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
996
diff
changeset
|
85 server_.Store(id, toStore); |
| 0 | 86 } |
| 87 } | |
| 88 }; | |
| 89 | |
| 90 | |
|
1797
23722a191e4e
worklists are working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1796
diff
changeset
|
91 |
|
2381
b8969010b534
uncoupling DCMTK primitives from Orthanc::Configuration
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2375
diff
changeset
|
92 class ModalitiesFromConfiguration : public Orthanc::DicomServer::IRemoteModalities |
|
b8969010b534
uncoupling DCMTK primitives from Orthanc::Configuration
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2375
diff
changeset
|
93 { |
|
b8969010b534
uncoupling DCMTK primitives from Orthanc::Configuration
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2375
diff
changeset
|
94 public: |
|
b8969010b534
uncoupling DCMTK primitives from Orthanc::Configuration
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2375
diff
changeset
|
95 virtual bool IsSameAETitle(const std::string& aet1, |
|
b8969010b534
uncoupling DCMTK primitives from Orthanc::Configuration
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2375
diff
changeset
|
96 const std::string& aet2) |
|
b8969010b534
uncoupling DCMTK primitives from Orthanc::Configuration
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2375
diff
changeset
|
97 { |
|
b8969010b534
uncoupling DCMTK primitives from Orthanc::Configuration
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2375
diff
changeset
|
98 return Orthanc::Configuration::IsSameAETitle(aet1, aet2); |
|
b8969010b534
uncoupling DCMTK primitives from Orthanc::Configuration
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2375
diff
changeset
|
99 } |
|
b8969010b534
uncoupling DCMTK primitives from Orthanc::Configuration
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2375
diff
changeset
|
100 |
|
b8969010b534
uncoupling DCMTK primitives from Orthanc::Configuration
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2375
diff
changeset
|
101 virtual bool LookupAETitle(RemoteModalityParameters& modality, |
|
b8969010b534
uncoupling DCMTK primitives from Orthanc::Configuration
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2375
diff
changeset
|
102 const std::string& aet) |
|
b8969010b534
uncoupling DCMTK primitives from Orthanc::Configuration
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2375
diff
changeset
|
103 { |
|
b8969010b534
uncoupling DCMTK primitives from Orthanc::Configuration
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2375
diff
changeset
|
104 return Orthanc::Configuration::LookupDicomModalityUsingAETitle(modality, aet); |
|
b8969010b534
uncoupling DCMTK primitives from Orthanc::Configuration
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2375
diff
changeset
|
105 } |
|
b8969010b534
uncoupling DCMTK primitives from Orthanc::Configuration
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2375
diff
changeset
|
106 }; |
|
b8969010b534
uncoupling DCMTK primitives from Orthanc::Configuration
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2375
diff
changeset
|
107 |
|
b8969010b534
uncoupling DCMTK primitives from Orthanc::Configuration
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2375
diff
changeset
|
108 |
|
387
ff647eedfbe1
enabling of Find/Move commands
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
376
diff
changeset
|
109 class MyDicomServerFactory : |
|
ff647eedfbe1
enabling of Find/Move commands
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
376
diff
changeset
|
110 public IStoreRequestHandlerFactory, |
|
1800
30e97a1f4093
callback for handling worklists with plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1799
diff
changeset
|
111 public IFindRequestHandlerFactory, |
|
387
ff647eedfbe1
enabling of Find/Move commands
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
376
diff
changeset
|
112 public IMoveRequestHandlerFactory |
|
ff647eedfbe1
enabling of Find/Move commands
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
376
diff
changeset
|
113 { |
|
ff647eedfbe1
enabling of Find/Move commands
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
376
diff
changeset
|
114 private: |
|
ff647eedfbe1
enabling of Find/Move commands
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
376
diff
changeset
|
115 ServerContext& context_; |
|
ff647eedfbe1
enabling of Find/Move commands
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
376
diff
changeset
|
116 |
|
ff647eedfbe1
enabling of Find/Move commands
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
376
diff
changeset
|
117 public: |
|
ff647eedfbe1
enabling of Find/Move commands
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
376
diff
changeset
|
118 MyDicomServerFactory(ServerContext& context) : context_(context) |
| 0 | 119 { |
| 120 } | |
| 121 | |
| 122 virtual IStoreRequestHandler* ConstructStoreRequestHandler() | |
| 123 { | |
| 613 | 124 return new OrthancStoreRequestHandler(context_); |
|
387
ff647eedfbe1
enabling of Find/Move commands
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
376
diff
changeset
|
125 } |
|
ff647eedfbe1
enabling of Find/Move commands
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
376
diff
changeset
|
126 |
|
ff647eedfbe1
enabling of Find/Move commands
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
376
diff
changeset
|
127 virtual IFindRequestHandler* ConstructFindRequestHandler() |
|
ff647eedfbe1
enabling of Find/Move commands
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
376
diff
changeset
|
128 { |
|
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
|
129 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
|
130 |
|
2069
fabf7820d1f1
New configuration options: "DicomScuTimeout" and "DicomScpTimeout" + validation of non-negative options
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2018
diff
changeset
|
131 result->SetMaxResults(Configuration::GetGlobalUnsignedIntegerParameter("LimitFindResults", 0)); |
|
fabf7820d1f1
New configuration options: "DicomScuTimeout" and "DicomScpTimeout" + validation of non-negative options
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2018
diff
changeset
|
132 result->SetMaxInstances(Configuration::GetGlobalUnsignedIntegerParameter("LimitFindInstances", 0)); |
|
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
|
133 |
|
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 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
|
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 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
|
137 } |
|
83489fddd8c5
Options to limit the number of results for an incoming C-FIND query
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
831
diff
changeset
|
138 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
|
139 { |
|
83489fddd8c5
Options to limit the number of results for an incoming C-FIND query
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
831
diff
changeset
|
140 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
|
141 << " 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
|
142 } |
|
83489fddd8c5
Options to limit the number of results for an incoming C-FIND query
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
831
diff
changeset
|
143 |
|
83489fddd8c5
Options to limit the number of results for an incoming C-FIND query
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
831
diff
changeset
|
144 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
|
145 { |
|
83489fddd8c5
Options to limit the number of results for an incoming C-FIND query
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
831
diff
changeset
|
146 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
|
147 } |
|
83489fddd8c5
Options to limit the number of results for an incoming C-FIND query
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
831
diff
changeset
|
148 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
|
149 { |
|
83489fddd8c5
Options to limit the number of results for an incoming C-FIND query
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
831
diff
changeset
|
150 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
|
151 << " 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
|
152 } |
|
83489fddd8c5
Options to limit the number of results for an incoming C-FIND query
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
831
diff
changeset
|
153 |
|
83489fddd8c5
Options to limit the number of results for an incoming C-FIND query
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
831
diff
changeset
|
154 return result.release(); |
|
387
ff647eedfbe1
enabling of Find/Move commands
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
376
diff
changeset
|
155 } |
|
ff647eedfbe1
enabling of Find/Move commands
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
376
diff
changeset
|
156 |
|
ff647eedfbe1
enabling of Find/Move commands
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
376
diff
changeset
|
157 virtual IMoveRequestHandler* ConstructMoveRequestHandler() |
|
ff647eedfbe1
enabling of Find/Move commands
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
376
diff
changeset
|
158 { |
| 613 | 159 return new OrthancMoveRequestHandler(context_); |
| 0 | 160 } |
| 161 | |
| 162 void Done() | |
| 163 { | |
| 164 } | |
| 165 }; | |
| 166 | |
| 167 | |
| 618 | 168 class OrthancApplicationEntityFilter : public IApplicationEntityFilter |
| 169 { | |
|
1164
0a55d8eb194e
Configuration/Lua to select the accepted C-Store SCP transfer syntaxes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1163
diff
changeset
|
170 private: |
|
0a55d8eb194e
Configuration/Lua to select the accepted C-Store SCP transfer syntaxes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1163
diff
changeset
|
171 ServerContext& context_; |
|
2375
3ec85ff48374
New security-related options: "DicomAlwaysAllowEcho"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2353
diff
changeset
|
172 bool alwaysAllowEcho_; |
|
2353
2421c137c304
reject connections earlier if DicomAlwaysAllowStore == false
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2352
diff
changeset
|
173 bool alwaysAllowStore_; |
|
1164
0a55d8eb194e
Configuration/Lua to select the accepted C-Store SCP transfer syntaxes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1163
diff
changeset
|
174 |
| 618 | 175 public: |
|
2353
2421c137c304
reject connections earlier if DicomAlwaysAllowStore == false
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2352
diff
changeset
|
176 OrthancApplicationEntityFilter(ServerContext& context) : |
|
2421c137c304
reject connections earlier if DicomAlwaysAllowStore == false
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2352
diff
changeset
|
177 context_(context) |
|
1164
0a55d8eb194e
Configuration/Lua to select the accepted C-Store SCP transfer syntaxes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1163
diff
changeset
|
178 { |
|
2375
3ec85ff48374
New security-related options: "DicomAlwaysAllowEcho"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2353
diff
changeset
|
179 alwaysAllowEcho_ = Configuration::GetGlobalBoolParameter("DicomAlwaysAllowEcho", true); |
|
2353
2421c137c304
reject connections earlier if DicomAlwaysAllowStore == false
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2352
diff
changeset
|
180 alwaysAllowStore_ = Configuration::GetGlobalBoolParameter("DicomAlwaysAllowStore", true); |
|
1164
0a55d8eb194e
Configuration/Lua to select the accepted C-Store SCP transfer syntaxes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1163
diff
changeset
|
181 } |
|
0a55d8eb194e
Configuration/Lua to select the accepted C-Store SCP transfer syntaxes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1163
diff
changeset
|
182 |
|
2352
3ab96768d144
Fix issue 52 (DICOM level security association problems)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2299
diff
changeset
|
183 virtual bool IsAllowedConnection(const std::string& remoteIp, |
|
3ab96768d144
Fix issue 52 (DICOM level security association problems)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2299
diff
changeset
|
184 const std::string& remoteAet, |
|
3ab96768d144
Fix issue 52 (DICOM level security association problems)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2299
diff
changeset
|
185 const std::string& calledAet) |
| 618 | 186 { |
|
2352
3ab96768d144
Fix issue 52 (DICOM level security association problems)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2299
diff
changeset
|
187 LOG(INFO) << "Incoming connection from AET " << remoteAet |
|
3ab96768d144
Fix issue 52 (DICOM level security association problems)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2299
diff
changeset
|
188 << " on IP " << remoteIp << ", calling AET " << calledAet; |
|
2353
2421c137c304
reject connections earlier if DicomAlwaysAllowStore == false
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2352
diff
changeset
|
189 |
|
2375
3ec85ff48374
New security-related options: "DicomAlwaysAllowEcho"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2353
diff
changeset
|
190 return (alwaysAllowEcho_ || |
|
3ec85ff48374
New security-related options: "DicomAlwaysAllowEcho"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2353
diff
changeset
|
191 alwaysAllowStore_ || |
|
2353
2421c137c304
reject connections earlier if DicomAlwaysAllowStore == false
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2352
diff
changeset
|
192 Configuration::IsKnownAETitle(remoteAet, remoteIp)); |
|
620
4aa6f0d79947
security filter for dicom requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
619
diff
changeset
|
193 } |
|
4aa6f0d79947
security filter for dicom requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
619
diff
changeset
|
194 |
|
2352
3ab96768d144
Fix issue 52 (DICOM level security association problems)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2299
diff
changeset
|
195 virtual bool IsAllowedRequest(const std::string& remoteIp, |
|
1799
4f01c9d73f02
calledAet made available to all the handlers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1797
diff
changeset
|
196 const std::string& remoteAet, |
|
2352
3ab96768d144
Fix issue 52 (DICOM level security association problems)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2299
diff
changeset
|
197 const std::string& calledAet, |
|
620
4aa6f0d79947
security filter for dicom requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
619
diff
changeset
|
198 DicomRequestType type) |
|
4aa6f0d79947
security filter for dicom requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
619
diff
changeset
|
199 { |
|
2352
3ab96768d144
Fix issue 52 (DICOM level security association problems)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2299
diff
changeset
|
200 LOG(INFO) << "Incoming " << Orthanc::EnumerationToString(type) << " request from AET " |
|
3ab96768d144
Fix issue 52 (DICOM level security association problems)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2299
diff
changeset
|
201 << remoteAet << " on IP " << remoteIp << ", calling AET " << calledAet; |
|
3ab96768d144
Fix issue 52 (DICOM level security association problems)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2299
diff
changeset
|
202 |
|
2375
3ec85ff48374
New security-related options: "DicomAlwaysAllowEcho"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2353
diff
changeset
|
203 if (type == DicomRequestType_Echo && |
|
3ec85ff48374
New security-related options: "DicomAlwaysAllowEcho"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2353
diff
changeset
|
204 alwaysAllowEcho_) |
|
620
4aa6f0d79947
security filter for dicom requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
619
diff
changeset
|
205 { |
|
2375
3ec85ff48374
New security-related options: "DicomAlwaysAllowEcho"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2353
diff
changeset
|
206 // Incoming C-Echo requests are always accepted, even from unknown AET |
|
3ec85ff48374
New security-related options: "DicomAlwaysAllowEcho"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2353
diff
changeset
|
207 return true; |
|
3ec85ff48374
New security-related options: "DicomAlwaysAllowEcho"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2353
diff
changeset
|
208 } |
|
3ec85ff48374
New security-related options: "DicomAlwaysAllowEcho"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2353
diff
changeset
|
209 else if (type == DicomRequestType_Store && |
|
3ec85ff48374
New security-related options: "DicomAlwaysAllowEcho"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2353
diff
changeset
|
210 alwaysAllowStore_) |
|
3ec85ff48374
New security-related options: "DicomAlwaysAllowEcho"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2353
diff
changeset
|
211 { |
|
3ec85ff48374
New security-related options: "DicomAlwaysAllowEcho"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2353
diff
changeset
|
212 // Incoming C-Store requests are always accepted, even from unknown AET |
|
620
4aa6f0d79947
security filter for dicom requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
619
diff
changeset
|
213 return true; |
|
4aa6f0d79947
security filter for dicom requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
619
diff
changeset
|
214 } |
|
2353
2421c137c304
reject connections earlier if DicomAlwaysAllowStore == false
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2352
diff
changeset
|
215 else if (!Configuration::IsKnownAETitle(remoteAet, remoteIp)) |
| 618 | 216 { |
| 217 return false; | |
| 218 } | |
| 219 else | |
| 220 { | |
| 221 return true; | |
| 222 } | |
| 223 } | |
|
1163
3db41779d8f9
abstraction to allow/prevent transfer syntaxes on AET basis
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1135
diff
changeset
|
224 |
|
1799
4f01c9d73f02
calledAet made available to all the handlers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1797
diff
changeset
|
225 virtual bool IsAllowedTransferSyntax(const std::string& remoteIp, |
|
4f01c9d73f02
calledAet made available to all the handlers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1797
diff
changeset
|
226 const std::string& remoteAet, |
|
1806
cd213ebcaefd
UnknownSopClassAccepted option
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1802
diff
changeset
|
227 const std::string& calledAet, |
|
1163
3db41779d8f9
abstraction to allow/prevent transfer syntaxes on AET basis
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1135
diff
changeset
|
228 TransferSyntax syntax) |
|
3db41779d8f9
abstraction to allow/prevent transfer syntaxes on AET basis
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1135
diff
changeset
|
229 { |
|
1164
0a55d8eb194e
Configuration/Lua to select the accepted C-Store SCP transfer syntaxes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1163
diff
changeset
|
230 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
|
231 |
|
0a55d8eb194e
Configuration/Lua to select the accepted C-Store SCP transfer syntaxes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1163
diff
changeset
|
232 switch (syntax) |
|
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 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
|
235 configuration = "DeflatedTransferSyntaxAccepted"; |
|
0a55d8eb194e
Configuration/Lua to select the accepted C-Store SCP transfer syntaxes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1163
diff
changeset
|
236 break; |
|
0a55d8eb194e
Configuration/Lua to select the accepted C-Store SCP transfer syntaxes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1163
diff
changeset
|
237 |
|
0a55d8eb194e
Configuration/Lua to select the accepted C-Store SCP transfer syntaxes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1163
diff
changeset
|
238 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
|
239 configuration = "JpegTransferSyntaxAccepted"; |
|
0a55d8eb194e
Configuration/Lua to select the accepted C-Store SCP transfer syntaxes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1163
diff
changeset
|
240 break; |
|
0a55d8eb194e
Configuration/Lua to select the accepted C-Store SCP transfer syntaxes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1163
diff
changeset
|
241 |
|
0a55d8eb194e
Configuration/Lua to select the accepted C-Store SCP transfer syntaxes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1163
diff
changeset
|
242 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
|
243 configuration = "Jpeg2000TransferSyntaxAccepted"; |
|
0a55d8eb194e
Configuration/Lua to select the accepted C-Store SCP transfer syntaxes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1163
diff
changeset
|
244 break; |
|
0a55d8eb194e
Configuration/Lua to select the accepted C-Store SCP transfer syntaxes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1163
diff
changeset
|
245 |
|
0a55d8eb194e
Configuration/Lua to select the accepted C-Store SCP transfer syntaxes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1163
diff
changeset
|
246 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
|
247 configuration = "JpegLosslessTransferSyntaxAccepted"; |
|
0a55d8eb194e
Configuration/Lua to select the accepted C-Store SCP transfer syntaxes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1163
diff
changeset
|
248 break; |
|
0a55d8eb194e
Configuration/Lua to select the accepted C-Store SCP transfer syntaxes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1163
diff
changeset
|
249 |
|
0a55d8eb194e
Configuration/Lua to select the accepted C-Store SCP transfer syntaxes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1163
diff
changeset
|
250 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
|
251 configuration = "JpipTransferSyntaxAccepted"; |
|
0a55d8eb194e
Configuration/Lua to select the accepted C-Store SCP transfer syntaxes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1163
diff
changeset
|
252 break; |
|
0a55d8eb194e
Configuration/Lua to select the accepted C-Store SCP transfer syntaxes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1163
diff
changeset
|
253 |
|
0a55d8eb194e
Configuration/Lua to select the accepted C-Store SCP transfer syntaxes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1163
diff
changeset
|
254 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
|
255 configuration = "Mpeg2TransferSyntaxAccepted"; |
|
0a55d8eb194e
Configuration/Lua to select the accepted C-Store SCP transfer syntaxes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1163
diff
changeset
|
256 break; |
|
0a55d8eb194e
Configuration/Lua to select the accepted C-Store SCP transfer syntaxes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1163
diff
changeset
|
257 |
|
0a55d8eb194e
Configuration/Lua to select the accepted C-Store SCP transfer syntaxes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1163
diff
changeset
|
258 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
|
259 configuration = "RleTransferSyntaxAccepted"; |
|
0a55d8eb194e
Configuration/Lua to select the accepted C-Store SCP transfer syntaxes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1163
diff
changeset
|
260 break; |
|
0a55d8eb194e
Configuration/Lua to select the accepted C-Store SCP transfer syntaxes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1163
diff
changeset
|
261 |
|
0a55d8eb194e
Configuration/Lua to select the accepted C-Store SCP transfer syntaxes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1163
diff
changeset
|
262 default: |
|
0a55d8eb194e
Configuration/Lua to select the accepted C-Store SCP transfer syntaxes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1163
diff
changeset
|
263 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
|
264 } |
|
0a55d8eb194e
Configuration/Lua to select the accepted C-Store SCP transfer syntaxes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1163
diff
changeset
|
265 |
|
0a55d8eb194e
Configuration/Lua to select the accepted C-Store SCP transfer syntaxes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1163
diff
changeset
|
266 { |
|
0a55d8eb194e
Configuration/Lua to select the accepted C-Store SCP transfer syntaxes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1163
diff
changeset
|
267 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
|
268 |
|
1433
461e7554bff7
refactoring: LuaScripting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1368
diff
changeset
|
269 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
|
270 |
|
0a55d8eb194e
Configuration/Lua to select the accepted C-Store SCP transfer syntaxes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1163
diff
changeset
|
271 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
|
272 { |
|
0a55d8eb194e
Configuration/Lua to select the accepted C-Store SCP transfer syntaxes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1163
diff
changeset
|
273 LuaFunctionCall call(locker.GetLua(), lua.c_str()); |
|
1799
4f01c9d73f02
calledAet made available to all the handlers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1797
diff
changeset
|
274 call.PushString(remoteAet); |
|
4f01c9d73f02
calledAet made available to all the handlers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1797
diff
changeset
|
275 call.PushString(remoteIp); |
|
1806
cd213ebcaefd
UnknownSopClassAccepted option
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1802
diff
changeset
|
276 call.PushString(calledAet); |
|
cd213ebcaefd
UnknownSopClassAccepted option
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1802
diff
changeset
|
277 return call.ExecutePredicate(); |
|
cd213ebcaefd
UnknownSopClassAccepted option
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1802
diff
changeset
|
278 } |
|
cd213ebcaefd
UnknownSopClassAccepted option
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1802
diff
changeset
|
279 } |
|
cd213ebcaefd
UnknownSopClassAccepted option
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1802
diff
changeset
|
280 |
|
cd213ebcaefd
UnknownSopClassAccepted option
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1802
diff
changeset
|
281 return Configuration::GetGlobalBoolParameter(configuration, true); |
|
cd213ebcaefd
UnknownSopClassAccepted option
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1802
diff
changeset
|
282 } |
|
cd213ebcaefd
UnknownSopClassAccepted option
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1802
diff
changeset
|
283 |
|
cd213ebcaefd
UnknownSopClassAccepted option
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1802
diff
changeset
|
284 |
|
cd213ebcaefd
UnknownSopClassAccepted option
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1802
diff
changeset
|
285 virtual bool IsUnknownSopClassAccepted(const std::string& remoteIp, |
|
cd213ebcaefd
UnknownSopClassAccepted option
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1802
diff
changeset
|
286 const std::string& remoteAet, |
|
cd213ebcaefd
UnknownSopClassAccepted option
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1802
diff
changeset
|
287 const std::string& calledAet) |
|
cd213ebcaefd
UnknownSopClassAccepted option
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1802
diff
changeset
|
288 { |
|
cd213ebcaefd
UnknownSopClassAccepted option
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1802
diff
changeset
|
289 static const char* configuration = "UnknownSopClassAccepted"; |
|
cd213ebcaefd
UnknownSopClassAccepted option
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1802
diff
changeset
|
290 |
|
cd213ebcaefd
UnknownSopClassAccepted option
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1802
diff
changeset
|
291 { |
|
cd213ebcaefd
UnknownSopClassAccepted option
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1802
diff
changeset
|
292 std::string lua = "Is" + std::string(configuration); |
|
cd213ebcaefd
UnknownSopClassAccepted option
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1802
diff
changeset
|
293 |
|
cd213ebcaefd
UnknownSopClassAccepted option
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1802
diff
changeset
|
294 LuaScripting::Locker locker(context_.GetLua()); |
|
cd213ebcaefd
UnknownSopClassAccepted option
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1802
diff
changeset
|
295 |
|
cd213ebcaefd
UnknownSopClassAccepted option
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1802
diff
changeset
|
296 if (locker.GetLua().IsExistingFunction(lua.c_str())) |
|
cd213ebcaefd
UnknownSopClassAccepted option
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1802
diff
changeset
|
297 { |
|
cd213ebcaefd
UnknownSopClassAccepted option
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1802
diff
changeset
|
298 LuaFunctionCall call(locker.GetLua(), lua.c_str()); |
|
cd213ebcaefd
UnknownSopClassAccepted option
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1802
diff
changeset
|
299 call.PushString(remoteAet); |
|
cd213ebcaefd
UnknownSopClassAccepted option
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1802
diff
changeset
|
300 call.PushString(remoteIp); |
|
cd213ebcaefd
UnknownSopClassAccepted option
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1802
diff
changeset
|
301 call.PushString(calledAet); |
|
1164
0a55d8eb194e
Configuration/Lua to select the accepted C-Store SCP transfer syntaxes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1163
diff
changeset
|
302 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
|
303 } |
|
0a55d8eb194e
Configuration/Lua to select the accepted C-Store SCP transfer syntaxes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1163
diff
changeset
|
304 } |
|
0a55d8eb194e
Configuration/Lua to select the accepted C-Store SCP transfer syntaxes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1163
diff
changeset
|
305 |
|
1871
e8146c9c28a4
Promiscuous mode is now turned off by default
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1866
diff
changeset
|
306 return Configuration::GetGlobalBoolParameter(configuration, false); |
|
1163
3db41779d8f9
abstraction to allow/prevent transfer syntaxes on AET basis
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1135
diff
changeset
|
307 } |
| 618 | 308 }; |
| 309 | |
| 310 | |
|
409
63f707278fc8
lua filtering of incoming http requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
407
diff
changeset
|
311 class MyIncomingHttpRequestFilter : public IIncomingHttpRequestFilter |
|
63f707278fc8
lua filtering of incoming http requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
407
diff
changeset
|
312 { |
|
63f707278fc8
lua filtering of incoming http requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
407
diff
changeset
|
313 private: |
|
63f707278fc8
lua filtering of incoming http requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
407
diff
changeset
|
314 ServerContext& context_; |
| 1962 | 315 OrthancPlugins* plugins_; |
|
409
63f707278fc8
lua filtering of incoming http requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
407
diff
changeset
|
316 |
|
63f707278fc8
lua filtering of incoming http requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
407
diff
changeset
|
317 public: |
| 1962 | 318 MyIncomingHttpRequestFilter(ServerContext& context, |
| 319 OrthancPlugins* plugins) : | |
| 320 context_(context), | |
| 321 plugins_(plugins) | |
|
409
63f707278fc8
lua filtering of incoming http requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
407
diff
changeset
|
322 { |
|
63f707278fc8
lua filtering of incoming http requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
407
diff
changeset
|
323 } |
|
63f707278fc8
lua filtering of incoming http requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
407
diff
changeset
|
324 |
|
473
c9a5d72f8481
changing the namespace of HTTP enumerations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
426
diff
changeset
|
325 virtual bool IsAllowed(HttpMethod method, |
|
409
63f707278fc8
lua filtering of incoming http requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
407
diff
changeset
|
326 const char* uri, |
|
63f707278fc8
lua filtering of incoming http requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
407
diff
changeset
|
327 const char* ip, |
|
1959
45c4387a379c
Access to the HTTP headers in the "IncomingHttpRequestFilter()" callback
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1949
diff
changeset
|
328 const char* username, |
|
2268
ce5c13b95dac
New function: OrthancPluginRegisterIncomingHttpRequestFilter2()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2246
diff
changeset
|
329 const IHttpHandler::Arguments& httpHeaders, |
|
ce5c13b95dac
New function: OrthancPluginRegisterIncomingHttpRequestFilter2()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2246
diff
changeset
|
330 const IHttpHandler::GetArguments& getArguments) const |
|
409
63f707278fc8
lua filtering of incoming http requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
407
diff
changeset
|
331 { |
| 1962 | 332 if (plugins_ != NULL && |
|
2268
ce5c13b95dac
New function: OrthancPluginRegisterIncomingHttpRequestFilter2()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2246
diff
changeset
|
333 !plugins_->IsAllowed(method, uri, ip, username, httpHeaders, getArguments)) |
| 1962 | 334 { |
| 335 return false; | |
| 336 } | |
| 337 | |
|
409
63f707278fc8
lua filtering of incoming http requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
407
diff
changeset
|
338 static const char* HTTP_FILTER = "IncomingHttpRequestFilter"; |
|
63f707278fc8
lua filtering of incoming http requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
407
diff
changeset
|
339 |
|
1433
461e7554bff7
refactoring: LuaScripting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1368
diff
changeset
|
340 LuaScripting::Locker locker(context_.GetLua()); |
|
996
cf52f3bcb2b3
clarification of Lua classes wrt multithreading
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
941
diff
changeset
|
341 |
|
409
63f707278fc8
lua filtering of incoming http requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
407
diff
changeset
|
342 // 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
|
343 if (locker.GetLua().IsExistingFunction(HTTP_FILTER)) |
|
409
63f707278fc8
lua filtering of incoming http requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
407
diff
changeset
|
344 { |
|
996
cf52f3bcb2b3
clarification of Lua classes wrt multithreading
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
941
diff
changeset
|
345 LuaFunctionCall call(locker.GetLua(), HTTP_FILTER); |
|
409
63f707278fc8
lua filtering of incoming http requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
407
diff
changeset
|
346 |
|
63f707278fc8
lua filtering of incoming http requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
407
diff
changeset
|
347 switch (method) |
|
63f707278fc8
lua filtering of incoming http requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
407
diff
changeset
|
348 { |
|
473
c9a5d72f8481
changing the namespace of HTTP enumerations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
426
diff
changeset
|
349 case HttpMethod_Get: |
|
409
63f707278fc8
lua filtering of incoming http requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
407
diff
changeset
|
350 call.PushString("GET"); |
|
63f707278fc8
lua filtering of incoming http requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
407
diff
changeset
|
351 break; |
|
63f707278fc8
lua filtering of incoming http requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
407
diff
changeset
|
352 |
|
473
c9a5d72f8481
changing the namespace of HTTP enumerations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
426
diff
changeset
|
353 case HttpMethod_Put: |
|
409
63f707278fc8
lua filtering of incoming http requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
407
diff
changeset
|
354 call.PushString("PUT"); |
|
63f707278fc8
lua filtering of incoming http requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
407
diff
changeset
|
355 break; |
|
63f707278fc8
lua filtering of incoming http requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
407
diff
changeset
|
356 |
|
473
c9a5d72f8481
changing the namespace of HTTP enumerations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
426
diff
changeset
|
357 case HttpMethod_Post: |
|
409
63f707278fc8
lua filtering of incoming http requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
407
diff
changeset
|
358 call.PushString("POST"); |
|
63f707278fc8
lua filtering of incoming http requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
407
diff
changeset
|
359 break; |
|
63f707278fc8
lua filtering of incoming http requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
407
diff
changeset
|
360 |
|
473
c9a5d72f8481
changing the namespace of HTTP enumerations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
426
diff
changeset
|
361 case HttpMethod_Delete: |
|
409
63f707278fc8
lua filtering of incoming http requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
407
diff
changeset
|
362 call.PushString("DELETE"); |
|
63f707278fc8
lua filtering of incoming http requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
407
diff
changeset
|
363 break; |
|
63f707278fc8
lua filtering of incoming http requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
407
diff
changeset
|
364 |
|
63f707278fc8
lua filtering of incoming http requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
407
diff
changeset
|
365 default: |
|
63f707278fc8
lua filtering of incoming http requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
407
diff
changeset
|
366 return true; |
|
63f707278fc8
lua filtering of incoming http requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
407
diff
changeset
|
367 } |
|
63f707278fc8
lua filtering of incoming http requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
407
diff
changeset
|
368 |
|
63f707278fc8
lua filtering of incoming http requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
407
diff
changeset
|
369 call.PushString(uri); |
|
63f707278fc8
lua filtering of incoming http requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
407
diff
changeset
|
370 call.PushString(ip); |
|
63f707278fc8
lua filtering of incoming http requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
407
diff
changeset
|
371 call.PushString(username); |
|
1959
45c4387a379c
Access to the HTTP headers in the "IncomingHttpRequestFilter()" callback
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1949
diff
changeset
|
372 call.PushStringMap(httpHeaders); |
|
409
63f707278fc8
lua filtering of incoming http requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
407
diff
changeset
|
373 |
|
63f707278fc8
lua filtering of incoming http requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
407
diff
changeset
|
374 if (!call.ExecutePredicate()) |
|
63f707278fc8
lua filtering of incoming http requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
407
diff
changeset
|
375 { |
|
63f707278fc8
lua filtering of incoming http requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
407
diff
changeset
|
376 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
|
377 return false; |
|
63f707278fc8
lua filtering of incoming http requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
407
diff
changeset
|
378 } |
|
63f707278fc8
lua filtering of incoming http requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
407
diff
changeset
|
379 } |
|
63f707278fc8
lua filtering of incoming http requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
407
diff
changeset
|
380 |
|
63f707278fc8
lua filtering of incoming http requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
407
diff
changeset
|
381 return true; |
|
63f707278fc8
lua filtering of incoming http requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
407
diff
changeset
|
382 } |
|
63f707278fc8
lua filtering of incoming http requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
407
diff
changeset
|
383 }; |
|
63f707278fc8
lua filtering of incoming http requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
407
diff
changeset
|
384 |
|
63f707278fc8
lua filtering of incoming http requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
407
diff
changeset
|
385 |
|
1645
1558b3226b18
IHttpExceptionFormatter
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1632
diff
changeset
|
386 |
|
1558b3226b18
IHttpExceptionFormatter
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1632
diff
changeset
|
387 class MyHttpExceptionFormatter : public IHttpExceptionFormatter |
|
1558b3226b18
IHttpExceptionFormatter
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1632
diff
changeset
|
388 { |
|
1558b3226b18
IHttpExceptionFormatter
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1632
diff
changeset
|
389 private: |
|
1558b3226b18
IHttpExceptionFormatter
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1632
diff
changeset
|
390 bool describeErrors_; |
|
1558b3226b18
IHttpExceptionFormatter
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1632
diff
changeset
|
391 OrthancPlugins* plugins_; |
|
1558b3226b18
IHttpExceptionFormatter
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1632
diff
changeset
|
392 |
|
1558b3226b18
IHttpExceptionFormatter
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1632
diff
changeset
|
393 public: |
|
1558b3226b18
IHttpExceptionFormatter
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1632
diff
changeset
|
394 MyHttpExceptionFormatter(bool describeErrors, |
|
1558b3226b18
IHttpExceptionFormatter
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1632
diff
changeset
|
395 OrthancPlugins* plugins) : |
|
1558b3226b18
IHttpExceptionFormatter
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1632
diff
changeset
|
396 describeErrors_(describeErrors), |
|
1558b3226b18
IHttpExceptionFormatter
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1632
diff
changeset
|
397 plugins_(plugins) |
|
1558b3226b18
IHttpExceptionFormatter
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1632
diff
changeset
|
398 { |
|
1558b3226b18
IHttpExceptionFormatter
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1632
diff
changeset
|
399 } |
|
1558b3226b18
IHttpExceptionFormatter
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1632
diff
changeset
|
400 |
|
1558b3226b18
IHttpExceptionFormatter
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1632
diff
changeset
|
401 virtual void Format(HttpOutput& output, |
|
1558b3226b18
IHttpExceptionFormatter
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1632
diff
changeset
|
402 const OrthancException& exception, |
|
1558b3226b18
IHttpExceptionFormatter
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1632
diff
changeset
|
403 HttpMethod method, |
|
1558b3226b18
IHttpExceptionFormatter
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1632
diff
changeset
|
404 const char* uri) |
|
1558b3226b18
IHttpExceptionFormatter
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1632
diff
changeset
|
405 { |
| 1650 | 406 { |
| 407 bool isPlugin = false; | |
| 408 | |
|
2136
dd609a99d39a
uniformization of the macro naming
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2133
diff
changeset
|
409 #if ORTHANC_ENABLE_PLUGINS == 1 |
| 1650 | 410 if (plugins_ != NULL) |
| 411 { | |
|
1651
2e692c83e2f3
improved custom error login
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1650
diff
changeset
|
412 plugins_->GetErrorDictionary().LogError(exception.GetErrorCode(), true); |
| 1650 | 413 isPlugin = true; |
| 414 } | |
| 415 #endif | |
| 416 | |
| 417 if (!isPlugin) | |
| 418 { | |
| 419 LOG(ERROR) << "Exception in the HTTP handler: " << exception.What(); | |
| 420 } | |
| 421 } | |
| 422 | |
|
1645
1558b3226b18
IHttpExceptionFormatter
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1632
diff
changeset
|
423 Json::Value message = Json::objectValue; |
|
1558b3226b18
IHttpExceptionFormatter
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1632
diff
changeset
|
424 ErrorCode errorCode = exception.GetErrorCode(); |
|
1558b3226b18
IHttpExceptionFormatter
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1632
diff
changeset
|
425 HttpStatus httpStatus = exception.GetHttpStatus(); |
|
1558b3226b18
IHttpExceptionFormatter
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1632
diff
changeset
|
426 |
|
1649
8040d56cb0b3
New function "OrthancPluginRegisterErrorCode()" to declare custom error codes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1645
diff
changeset
|
427 { |
|
8040d56cb0b3
New function "OrthancPluginRegisterErrorCode()" to declare custom error codes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1645
diff
changeset
|
428 bool isPlugin = false; |
|
1645
1558b3226b18
IHttpExceptionFormatter
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1632
diff
changeset
|
429 |
|
2136
dd609a99d39a
uniformization of the macro naming
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2133
diff
changeset
|
430 #if ORTHANC_ENABLE_PLUGINS == 1 |
|
1649
8040d56cb0b3
New function "OrthancPluginRegisterErrorCode()" to declare custom error codes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1645
diff
changeset
|
431 if (plugins_ != NULL && |
|
8040d56cb0b3
New function "OrthancPluginRegisterErrorCode()" to declare custom error codes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1645
diff
changeset
|
432 plugins_->GetErrorDictionary().Format(message, httpStatus, exception)) |
|
8040d56cb0b3
New function "OrthancPluginRegisterErrorCode()" to declare custom error codes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1645
diff
changeset
|
433 { |
|
8040d56cb0b3
New function "OrthancPluginRegisterErrorCode()" to declare custom error codes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1645
diff
changeset
|
434 errorCode = ErrorCode_Plugin; |
|
8040d56cb0b3
New function "OrthancPluginRegisterErrorCode()" to declare custom error codes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1645
diff
changeset
|
435 isPlugin = true; |
|
8040d56cb0b3
New function "OrthancPluginRegisterErrorCode()" to declare custom error codes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1645
diff
changeset
|
436 } |
|
1645
1558b3226b18
IHttpExceptionFormatter
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1632
diff
changeset
|
437 #endif |
|
1558b3226b18
IHttpExceptionFormatter
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1632
diff
changeset
|
438 |
|
1649
8040d56cb0b3
New function "OrthancPluginRegisterErrorCode()" to declare custom error codes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1645
diff
changeset
|
439 if (!isPlugin) |
|
8040d56cb0b3
New function "OrthancPluginRegisterErrorCode()" to declare custom error codes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1645
diff
changeset
|
440 { |
|
8040d56cb0b3
New function "OrthancPluginRegisterErrorCode()" to declare custom error codes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1645
diff
changeset
|
441 message["Message"] = exception.What(); |
|
8040d56cb0b3
New function "OrthancPluginRegisterErrorCode()" to declare custom error codes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1645
diff
changeset
|
442 } |
|
1645
1558b3226b18
IHttpExceptionFormatter
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1632
diff
changeset
|
443 } |
|
1558b3226b18
IHttpExceptionFormatter
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1632
diff
changeset
|
444 |
|
1649
8040d56cb0b3
New function "OrthancPluginRegisterErrorCode()" to declare custom error codes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1645
diff
changeset
|
445 if (!describeErrors_) |
|
8040d56cb0b3
New function "OrthancPluginRegisterErrorCode()" to declare custom error codes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1645
diff
changeset
|
446 { |
|
8040d56cb0b3
New function "OrthancPluginRegisterErrorCode()" to declare custom error codes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1645
diff
changeset
|
447 output.SendStatus(httpStatus); |
|
8040d56cb0b3
New function "OrthancPluginRegisterErrorCode()" to declare custom error codes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1645
diff
changeset
|
448 } |
|
8040d56cb0b3
New function "OrthancPluginRegisterErrorCode()" to declare custom error codes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1645
diff
changeset
|
449 else |
|
8040d56cb0b3
New function "OrthancPluginRegisterErrorCode()" to declare custom error codes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1645
diff
changeset
|
450 { |
|
8040d56cb0b3
New function "OrthancPluginRegisterErrorCode()" to declare custom error codes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1645
diff
changeset
|
451 message["Method"] = EnumerationToString(method); |
|
8040d56cb0b3
New function "OrthancPluginRegisterErrorCode()" to declare custom error codes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1645
diff
changeset
|
452 message["Uri"] = uri; |
|
8040d56cb0b3
New function "OrthancPluginRegisterErrorCode()" to declare custom error codes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1645
diff
changeset
|
453 message["HttpError"] = EnumerationToString(httpStatus); |
|
8040d56cb0b3
New function "OrthancPluginRegisterErrorCode()" to declare custom error codes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1645
diff
changeset
|
454 message["HttpStatus"] = httpStatus; |
|
8040d56cb0b3
New function "OrthancPluginRegisterErrorCode()" to declare custom error codes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1645
diff
changeset
|
455 message["OrthancError"] = EnumerationToString(errorCode); |
|
8040d56cb0b3
New function "OrthancPluginRegisterErrorCode()" to declare custom error codes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1645
diff
changeset
|
456 message["OrthancStatus"] = errorCode; |
|
1645
1558b3226b18
IHttpExceptionFormatter
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1632
diff
changeset
|
457 |
|
1649
8040d56cb0b3
New function "OrthancPluginRegisterErrorCode()" to declare custom error codes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1645
diff
changeset
|
458 std::string info = message.toStyledString(); |
|
8040d56cb0b3
New function "OrthancPluginRegisterErrorCode()" to declare custom error codes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1645
diff
changeset
|
459 output.SendStatus(httpStatus, info); |
|
8040d56cb0b3
New function "OrthancPluginRegisterErrorCode()" to declare custom error codes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1645
diff
changeset
|
460 } |
|
1645
1558b3226b18
IHttpExceptionFormatter
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1632
diff
changeset
|
461 } |
|
1558b3226b18
IHttpExceptionFormatter
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1632
diff
changeset
|
462 }; |
|
1558b3226b18
IHttpExceptionFormatter
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1632
diff
changeset
|
463 |
|
1558b3226b18
IHttpExceptionFormatter
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1632
diff
changeset
|
464 |
|
1558b3226b18
IHttpExceptionFormatter
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1632
diff
changeset
|
465 |
| 1733 | 466 static void PrintHelp(const char* path) |
| 133 | 467 { |
| 468 std::cout | |
| 469 << "Usage: " << path << " [OPTION]... [CONFIGURATION]" << std::endl | |
|
175
662af781a227
sample config file from command line
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
158
diff
changeset
|
470 << "Orthanc, lightweight, RESTful DICOM server for healthcare and medical research." << std::endl |
| 133 | 471 << std::endl |
|
1666
d7039be97eeb
better command-line options handling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1651
diff
changeset
|
472 << "The \"CONFIGURATION\" argument can be a single file or a directory. In the " << std::endl |
|
d7039be97eeb
better command-line options handling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1651
diff
changeset
|
473 << "case of a directory, all the JSON files it contains will be merged. " << std::endl |
|
d7039be97eeb
better command-line options handling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1651
diff
changeset
|
474 << "If no configuration path is given on the command line, a set of default " << std::endl |
|
175
662af781a227
sample config file from command line
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
158
diff
changeset
|
475 << "parameters is used. Please refer to the Orthanc homepage for the full " << std::endl |
|
1615
c40fe92a68e7
Primitives to upgrade the database version in plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1592
diff
changeset
|
476 << "instructions about how to use Orthanc <http://www.orthanc-server.com/>." << std::endl |
| 133 | 477 << std::endl |
| 478 << "Command-line options:" << std::endl | |
| 479 << " --help\t\tdisplay this help and exit" << std::endl | |
| 480 << " --logdir=[dir]\tdirectory where to store the log files" << std::endl | |
|
2015
bcc575732aef
New option "--logfile" to output the Orthanc log to the given file
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2010
diff
changeset
|
481 << "\t\t\t(by default, the log is dumped to stderr)" << std::endl |
|
bcc575732aef
New option "--logfile" to output the Orthanc log to the given file
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2010
diff
changeset
|
482 << " --logfile=[file]\tfile where to store the log of Orthanc" << std::endl |
|
bcc575732aef
New option "--logfile" to output the Orthanc log to the given file
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2010
diff
changeset
|
483 << "\t\t\t(by default, the log is dumped to stderr)" << std::endl |
|
175
662af781a227
sample config file from command line
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
158
diff
changeset
|
484 << " --config=[file]\tcreate a sample configuration file and exit" << std::endl |
| 1733 | 485 << " --errors\t\tprint the supported error codes and exit" << std::endl |
|
1615
c40fe92a68e7
Primitives to upgrade the database version in plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1592
diff
changeset
|
486 << " --verbose\t\tbe verbose in logs" << std::endl |
|
175
662af781a227
sample config file from command line
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
158
diff
changeset
|
487 << " --trace\t\thighest verbosity in logs (for debug)" << std::endl |
|
1615
c40fe92a68e7
Primitives to upgrade the database version in plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1592
diff
changeset
|
488 << " --upgrade\t\tallow Orthanc to upgrade the version of the" << std::endl |
|
c40fe92a68e7
Primitives to upgrade the database version in plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1592
diff
changeset
|
489 << "\t\t\tdatabase (beware that the database will become" << std::endl |
|
c40fe92a68e7
Primitives to upgrade the database version in plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1592
diff
changeset
|
490 << "\t\t\tincompatible with former versions of Orthanc)" << std::endl |
|
175
662af781a227
sample config file from command line
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
158
diff
changeset
|
491 << " --version\t\toutput version information and exit" << std::endl |
| 133 | 492 << std::endl |
| 493 << "Exit status:" << std::endl | |
|
1615
c40fe92a68e7
Primitives to upgrade the database version in plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1592
diff
changeset
|
494 << " 0 if success," << std::endl |
| 1733 | 495 #if defined(_WIN32) |
| 496 << "!= 0 if error (use the --errors option to get the list of possible errors)." << std::endl | |
| 497 #else | |
|
1615
c40fe92a68e7
Primitives to upgrade the database version in plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1592
diff
changeset
|
498 << " -1 if error (have a look at the logs)." << std::endl |
| 1733 | 499 #endif |
| 133 | 500 << std::endl; |
| 501 } | |
| 0 | 502 |
| 503 | |
| 1733 | 504 static void PrintVersion(const char* path) |
| 133 | 505 { |
| 506 std::cout | |
| 507 << path << " " << ORTHANC_VERSION << std::endl | |
| 1900 | 508 << "Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics Department, University Hospital of Liege (Belgium)" << std::endl |
|
2447
878b59270859
upgrade to year 2018
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2382
diff
changeset
|
509 << "Copyright (C) 2017-2018 Osimis S.A. (Belgium)" << std::endl |
| 133 | 510 << "Licensing GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>, with OpenSSL exception." << std::endl |
| 511 << "This is free software: you are free to change and redistribute it." << std::endl | |
| 512 << "There is NO WARRANTY, to the extent permitted by law." << std::endl | |
| 513 << std::endl | |
| 514 << "Written by Sebastien Jodogne <s.jodogne@gmail.com>" << std::endl; | |
| 515 } | |
| 516 | |
| 0 | 517 |
| 1733 | 518 static void PrintErrorCode(ErrorCode code, const char* description) |
| 519 { | |
| 520 std::cout | |
| 521 << std::right << std::setw(16) | |
| 522 << static_cast<int>(code) | |
| 523 << " " << description << std::endl; | |
| 524 } | |
| 525 | |
| 526 | |
| 527 static void PrintErrors(const char* path) | |
| 528 { | |
| 529 std::cout | |
| 530 << path << " " << ORTHANC_VERSION << std::endl | |
|
1734
e2675b37eb01
Under Windows, the exit status of Orthanc corresponds to the encountered error code
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1733
diff
changeset
|
531 << "Orthanc, lightweight, RESTful DICOM server for healthcare and medical research." |
|
e2675b37eb01
Under Windows, the exit status of Orthanc corresponds to the encountered error code
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1733
diff
changeset
|
532 << std::endl << std::endl |
|
e2675b37eb01
Under Windows, the exit status of Orthanc corresponds to the encountered error code
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1733
diff
changeset
|
533 << "List of error codes that could be returned by Orthanc:" |
|
e2675b37eb01
Under Windows, the exit status of Orthanc corresponds to the encountered error code
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1733
diff
changeset
|
534 << std::endl << std::endl; |
| 1733 | 535 |
| 536 // The content of the following brackets is automatically generated | |
| 537 // by the "GenerateErrorCodes.py" script | |
| 538 { | |
|
1734
e2675b37eb01
Under Windows, the exit status of Orthanc corresponds to the encountered error code
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1733
diff
changeset
|
539 PrintErrorCode(ErrorCode_InternalError, "Internal error"); |
|
e2675b37eb01
Under Windows, the exit status of Orthanc corresponds to the encountered error code
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1733
diff
changeset
|
540 PrintErrorCode(ErrorCode_Success, "Success"); |
|
e2675b37eb01
Under Windows, the exit status of Orthanc corresponds to the encountered error code
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1733
diff
changeset
|
541 PrintErrorCode(ErrorCode_Plugin, "Error encountered within the plugin engine"); |
|
e2675b37eb01
Under Windows, the exit status of Orthanc corresponds to the encountered error code
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1733
diff
changeset
|
542 PrintErrorCode(ErrorCode_NotImplemented, "Not implemented yet"); |
|
e2675b37eb01
Under Windows, the exit status of Orthanc corresponds to the encountered error code
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1733
diff
changeset
|
543 PrintErrorCode(ErrorCode_ParameterOutOfRange, "Parameter out of range"); |
| 2133 | 544 PrintErrorCode(ErrorCode_NotEnoughMemory, "The server hosting Orthanc is running out of memory"); |
|
1734
e2675b37eb01
Under Windows, the exit status of Orthanc corresponds to the encountered error code
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1733
diff
changeset
|
545 PrintErrorCode(ErrorCode_BadParameterType, "Bad type for a parameter"); |
|
e2675b37eb01
Under Windows, the exit status of Orthanc corresponds to the encountered error code
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1733
diff
changeset
|
546 PrintErrorCode(ErrorCode_BadSequenceOfCalls, "Bad sequence of calls"); |
|
e2675b37eb01
Under Windows, the exit status of Orthanc corresponds to the encountered error code
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1733
diff
changeset
|
547 PrintErrorCode(ErrorCode_InexistentItem, "Accessing an inexistent item"); |
|
e2675b37eb01
Under Windows, the exit status of Orthanc corresponds to the encountered error code
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1733
diff
changeset
|
548 PrintErrorCode(ErrorCode_BadRequest, "Bad request"); |
|
e2675b37eb01
Under Windows, the exit status of Orthanc corresponds to the encountered error code
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1733
diff
changeset
|
549 PrintErrorCode(ErrorCode_NetworkProtocol, "Error in the network protocol"); |
|
e2675b37eb01
Under Windows, the exit status of Orthanc corresponds to the encountered error code
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1733
diff
changeset
|
550 PrintErrorCode(ErrorCode_SystemCommand, "Error while calling a system command"); |
|
e2675b37eb01
Under Windows, the exit status of Orthanc corresponds to the encountered error code
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1733
diff
changeset
|
551 PrintErrorCode(ErrorCode_Database, "Error with the database engine"); |
|
e2675b37eb01
Under Windows, the exit status of Orthanc corresponds to the encountered error code
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1733
diff
changeset
|
552 PrintErrorCode(ErrorCode_UriSyntax, "Badly formatted URI"); |
|
e2675b37eb01
Under Windows, the exit status of Orthanc corresponds to the encountered error code
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1733
diff
changeset
|
553 PrintErrorCode(ErrorCode_InexistentFile, "Inexistent file"); |
|
e2675b37eb01
Under Windows, the exit status of Orthanc corresponds to the encountered error code
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1733
diff
changeset
|
554 PrintErrorCode(ErrorCode_CannotWriteFile, "Cannot write to file"); |
|
e2675b37eb01
Under Windows, the exit status of Orthanc corresponds to the encountered error code
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1733
diff
changeset
|
555 PrintErrorCode(ErrorCode_BadFileFormat, "Bad file format"); |
|
e2675b37eb01
Under Windows, the exit status of Orthanc corresponds to the encountered error code
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1733
diff
changeset
|
556 PrintErrorCode(ErrorCode_Timeout, "Timeout"); |
|
e2675b37eb01
Under Windows, the exit status of Orthanc corresponds to the encountered error code
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1733
diff
changeset
|
557 PrintErrorCode(ErrorCode_UnknownResource, "Unknown resource"); |
|
e2675b37eb01
Under Windows, the exit status of Orthanc corresponds to the encountered error code
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1733
diff
changeset
|
558 PrintErrorCode(ErrorCode_IncompatibleDatabaseVersion, "Incompatible version of the database"); |
|
e2675b37eb01
Under Windows, the exit status of Orthanc corresponds to the encountered error code
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1733
diff
changeset
|
559 PrintErrorCode(ErrorCode_FullStorage, "The file storage is full"); |
|
e2675b37eb01
Under Windows, the exit status of Orthanc corresponds to the encountered error code
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1733
diff
changeset
|
560 PrintErrorCode(ErrorCode_CorruptedFile, "Corrupted file (e.g. inconsistent MD5 hash)"); |
|
e2675b37eb01
Under Windows, the exit status of Orthanc corresponds to the encountered error code
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1733
diff
changeset
|
561 PrintErrorCode(ErrorCode_InexistentTag, "Inexistent tag"); |
|
e2675b37eb01
Under Windows, the exit status of Orthanc corresponds to the encountered error code
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1733
diff
changeset
|
562 PrintErrorCode(ErrorCode_ReadOnly, "Cannot modify a read-only data structure"); |
|
e2675b37eb01
Under Windows, the exit status of Orthanc corresponds to the encountered error code
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1733
diff
changeset
|
563 PrintErrorCode(ErrorCode_IncompatibleImageFormat, "Incompatible format of the images"); |
|
e2675b37eb01
Under Windows, the exit status of Orthanc corresponds to the encountered error code
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1733
diff
changeset
|
564 PrintErrorCode(ErrorCode_IncompatibleImageSize, "Incompatible size of the images"); |
|
e2675b37eb01
Under Windows, the exit status of Orthanc corresponds to the encountered error code
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1733
diff
changeset
|
565 PrintErrorCode(ErrorCode_SharedLibrary, "Error while using a shared library (plugin)"); |
|
e2675b37eb01
Under Windows, the exit status of Orthanc corresponds to the encountered error code
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1733
diff
changeset
|
566 PrintErrorCode(ErrorCode_UnknownPluginService, "Plugin invoking an unknown service"); |
|
e2675b37eb01
Under Windows, the exit status of Orthanc corresponds to the encountered error code
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1733
diff
changeset
|
567 PrintErrorCode(ErrorCode_UnknownDicomTag, "Unknown DICOM tag"); |
|
e2675b37eb01
Under Windows, the exit status of Orthanc corresponds to the encountered error code
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1733
diff
changeset
|
568 PrintErrorCode(ErrorCode_BadJson, "Cannot parse a JSON document"); |
|
e2675b37eb01
Under Windows, the exit status of Orthanc corresponds to the encountered error code
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1733
diff
changeset
|
569 PrintErrorCode(ErrorCode_Unauthorized, "Bad credentials were provided to an HTTP request"); |
|
e2675b37eb01
Under Windows, the exit status of Orthanc corresponds to the encountered error code
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1733
diff
changeset
|
570 PrintErrorCode(ErrorCode_BadFont, "Badly formatted font file"); |
|
e2675b37eb01
Under Windows, the exit status of Orthanc corresponds to the encountered error code
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1733
diff
changeset
|
571 PrintErrorCode(ErrorCode_DatabasePlugin, "The plugin implementing a custom database back-end does not fulfill the proper interface"); |
|
e2675b37eb01
Under Windows, the exit status of Orthanc corresponds to the encountered error code
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1733
diff
changeset
|
572 PrintErrorCode(ErrorCode_StorageAreaPlugin, "Error in the plugin implementing a custom storage area"); |
| 1746 | 573 PrintErrorCode(ErrorCode_EmptyRequest, "The request is empty"); |
|
1781
5ad4e4d92ecb
AcceptMediaDispatcher bootstrap
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1746
diff
changeset
|
574 PrintErrorCode(ErrorCode_NotAcceptable, "Cannot send a response which is acceptable according to the Accept HTTP header"); |
|
2132
a43708636890
ErrorCode_NotEnoughMemory and ErrorCode_NullPointer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2079
diff
changeset
|
575 PrintErrorCode(ErrorCode_NullPointer, "Cannot handle a NULL pointer"); |
|
2486
ad8f30fc28d1
new error code: DatabaseUnavailable
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2447
diff
changeset
|
576 PrintErrorCode(ErrorCode_DatabaseUnavailable, "The database is currently not available (probably a transient situation)"); |
|
1734
e2675b37eb01
Under Windows, the exit status of Orthanc corresponds to the encountered error code
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1733
diff
changeset
|
577 PrintErrorCode(ErrorCode_SQLiteNotOpened, "SQLite: The database is not opened"); |
|
e2675b37eb01
Under Windows, the exit status of Orthanc corresponds to the encountered error code
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1733
diff
changeset
|
578 PrintErrorCode(ErrorCode_SQLiteAlreadyOpened, "SQLite: Connection is already open"); |
|
e2675b37eb01
Under Windows, the exit status of Orthanc corresponds to the encountered error code
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1733
diff
changeset
|
579 PrintErrorCode(ErrorCode_SQLiteCannotOpen, "SQLite: Unable to open the database"); |
|
e2675b37eb01
Under Windows, the exit status of Orthanc corresponds to the encountered error code
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1733
diff
changeset
|
580 PrintErrorCode(ErrorCode_SQLiteStatementAlreadyUsed, "SQLite: This cached statement is already being referred to"); |
|
e2675b37eb01
Under Windows, the exit status of Orthanc corresponds to the encountered error code
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1733
diff
changeset
|
581 PrintErrorCode(ErrorCode_SQLiteExecute, "SQLite: Cannot execute a command"); |
|
e2675b37eb01
Under Windows, the exit status of Orthanc corresponds to the encountered error code
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1733
diff
changeset
|
582 PrintErrorCode(ErrorCode_SQLiteRollbackWithoutTransaction, "SQLite: Rolling back a nonexistent transaction (have you called Begin()?)"); |
|
e2675b37eb01
Under Windows, the exit status of Orthanc corresponds to the encountered error code
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1733
diff
changeset
|
583 PrintErrorCode(ErrorCode_SQLiteCommitWithoutTransaction, "SQLite: Committing a nonexistent transaction"); |
|
e2675b37eb01
Under Windows, the exit status of Orthanc corresponds to the encountered error code
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1733
diff
changeset
|
584 PrintErrorCode(ErrorCode_SQLiteRegisterFunction, "SQLite: Unable to register a function"); |
|
e2675b37eb01
Under Windows, the exit status of Orthanc corresponds to the encountered error code
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1733
diff
changeset
|
585 PrintErrorCode(ErrorCode_SQLiteFlush, "SQLite: Unable to flush the database"); |
|
e2675b37eb01
Under Windows, the exit status of Orthanc corresponds to the encountered error code
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1733
diff
changeset
|
586 PrintErrorCode(ErrorCode_SQLiteCannotRun, "SQLite: Cannot run a cached statement"); |
|
e2675b37eb01
Under Windows, the exit status of Orthanc corresponds to the encountered error code
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1733
diff
changeset
|
587 PrintErrorCode(ErrorCode_SQLiteCannotStep, "SQLite: Cannot step over a cached statement"); |
|
e2675b37eb01
Under Windows, the exit status of Orthanc corresponds to the encountered error code
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1733
diff
changeset
|
588 PrintErrorCode(ErrorCode_SQLiteBindOutOfRange, "SQLite: Bing a value while out of range (serious error)"); |
|
e2675b37eb01
Under Windows, the exit status of Orthanc corresponds to the encountered error code
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1733
diff
changeset
|
589 PrintErrorCode(ErrorCode_SQLitePrepareStatement, "SQLite: Cannot prepare a cached statement"); |
|
e2675b37eb01
Under Windows, the exit status of Orthanc corresponds to the encountered error code
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1733
diff
changeset
|
590 PrintErrorCode(ErrorCode_SQLiteTransactionAlreadyStarted, "SQLite: Beginning the same transaction twice"); |
|
e2675b37eb01
Under Windows, the exit status of Orthanc corresponds to the encountered error code
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1733
diff
changeset
|
591 PrintErrorCode(ErrorCode_SQLiteTransactionCommit, "SQLite: Failure when committing the transaction"); |
|
e2675b37eb01
Under Windows, the exit status of Orthanc corresponds to the encountered error code
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1733
diff
changeset
|
592 PrintErrorCode(ErrorCode_SQLiteTransactionBegin, "SQLite: Cannot start a transaction"); |
|
e2675b37eb01
Under Windows, the exit status of Orthanc corresponds to the encountered error code
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1733
diff
changeset
|
593 PrintErrorCode(ErrorCode_DirectoryOverFile, "The directory to be created is already occupied by a regular file"); |
|
e2675b37eb01
Under Windows, the exit status of Orthanc corresponds to the encountered error code
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1733
diff
changeset
|
594 PrintErrorCode(ErrorCode_FileStorageCannotWrite, "Unable to create a subdirectory or a file in the file storage"); |
|
e2675b37eb01
Under Windows, the exit status of Orthanc corresponds to the encountered error code
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1733
diff
changeset
|
595 PrintErrorCode(ErrorCode_DirectoryExpected, "The specified path does not point to a directory"); |
|
1949
d90f737f2dde
warn about the use of privileged ports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1900
diff
changeset
|
596 PrintErrorCode(ErrorCode_HttpPortInUse, "The TCP port of the HTTP server is privileged or already in use"); |
|
d90f737f2dde
warn about the use of privileged ports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1900
diff
changeset
|
597 PrintErrorCode(ErrorCode_DicomPortInUse, "The TCP port of the DICOM server is privileged or already in use"); |
|
1734
e2675b37eb01
Under Windows, the exit status of Orthanc corresponds to the encountered error code
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1733
diff
changeset
|
598 PrintErrorCode(ErrorCode_BadHttpStatusInRest, "This HTTP status is not allowed in a REST API"); |
|
e2675b37eb01
Under Windows, the exit status of Orthanc corresponds to the encountered error code
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1733
diff
changeset
|
599 PrintErrorCode(ErrorCode_RegularFileExpected, "The specified path does not point to a regular file"); |
|
e2675b37eb01
Under Windows, the exit status of Orthanc corresponds to the encountered error code
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1733
diff
changeset
|
600 PrintErrorCode(ErrorCode_PathToExecutable, "Unable to get the path to the executable"); |
|
e2675b37eb01
Under Windows, the exit status of Orthanc corresponds to the encountered error code
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1733
diff
changeset
|
601 PrintErrorCode(ErrorCode_MakeDirectory, "Cannot create a directory"); |
|
e2675b37eb01
Under Windows, the exit status of Orthanc corresponds to the encountered error code
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1733
diff
changeset
|
602 PrintErrorCode(ErrorCode_BadApplicationEntityTitle, "An application entity title (AET) cannot be empty or be longer than 16 characters"); |
|
e2675b37eb01
Under Windows, the exit status of Orthanc corresponds to the encountered error code
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1733
diff
changeset
|
603 PrintErrorCode(ErrorCode_NoCFindHandler, "No request handler factory for DICOM C-FIND SCP"); |
|
e2675b37eb01
Under Windows, the exit status of Orthanc corresponds to the encountered error code
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1733
diff
changeset
|
604 PrintErrorCode(ErrorCode_NoCMoveHandler, "No request handler factory for DICOM C-MOVE SCP"); |
|
e2675b37eb01
Under Windows, the exit status of Orthanc corresponds to the encountered error code
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1733
diff
changeset
|
605 PrintErrorCode(ErrorCode_NoCStoreHandler, "No request handler factory for DICOM C-STORE SCP"); |
|
e2675b37eb01
Under Windows, the exit status of Orthanc corresponds to the encountered error code
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1733
diff
changeset
|
606 PrintErrorCode(ErrorCode_NoApplicationEntityFilter, "No application entity filter"); |
|
e2675b37eb01
Under Windows, the exit status of Orthanc corresponds to the encountered error code
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1733
diff
changeset
|
607 PrintErrorCode(ErrorCode_NoSopClassOrInstance, "DicomUserConnection: Unable to find the SOP class and instance"); |
|
e2675b37eb01
Under Windows, the exit status of Orthanc corresponds to the encountered error code
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1733
diff
changeset
|
608 PrintErrorCode(ErrorCode_NoPresentationContext, "DicomUserConnection: No acceptable presentation context for modality"); |
|
e2675b37eb01
Under Windows, the exit status of Orthanc corresponds to the encountered error code
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1733
diff
changeset
|
609 PrintErrorCode(ErrorCode_DicomFindUnavailable, "DicomUserConnection: The C-FIND command is not supported by the remote SCP"); |
|
e2675b37eb01
Under Windows, the exit status of Orthanc corresponds to the encountered error code
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1733
diff
changeset
|
610 PrintErrorCode(ErrorCode_DicomMoveUnavailable, "DicomUserConnection: The C-MOVE command is not supported by the remote SCP"); |
|
e2675b37eb01
Under Windows, the exit status of Orthanc corresponds to the encountered error code
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1733
diff
changeset
|
611 PrintErrorCode(ErrorCode_CannotStoreInstance, "Cannot store an instance"); |
|
e2675b37eb01
Under Windows, the exit status of Orthanc corresponds to the encountered error code
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1733
diff
changeset
|
612 PrintErrorCode(ErrorCode_CreateDicomNotString, "Only string values are supported when creating DICOM instances"); |
|
e2675b37eb01
Under Windows, the exit status of Orthanc corresponds to the encountered error code
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1733
diff
changeset
|
613 PrintErrorCode(ErrorCode_CreateDicomOverrideTag, "Trying to override a value inherited from a parent module"); |
|
e2675b37eb01
Under Windows, the exit status of Orthanc corresponds to the encountered error code
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1733
diff
changeset
|
614 PrintErrorCode(ErrorCode_CreateDicomUseContent, "Use \"Content\" to inject an image into a new DICOM instance"); |
|
e2675b37eb01
Under Windows, the exit status of Orthanc corresponds to the encountered error code
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1733
diff
changeset
|
615 PrintErrorCode(ErrorCode_CreateDicomNoPayload, "No payload is present for one instance in the series"); |
|
e2675b37eb01
Under Windows, the exit status of Orthanc corresponds to the encountered error code
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1733
diff
changeset
|
616 PrintErrorCode(ErrorCode_CreateDicomUseDataUriScheme, "The payload of the DICOM instance must be specified according to Data URI scheme"); |
|
e2675b37eb01
Under Windows, the exit status of Orthanc corresponds to the encountered error code
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1733
diff
changeset
|
617 PrintErrorCode(ErrorCode_CreateDicomBadParent, "Trying to attach a new DICOM instance to an inexistent resource"); |
|
e2675b37eb01
Under Windows, the exit status of Orthanc corresponds to the encountered error code
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1733
diff
changeset
|
618 PrintErrorCode(ErrorCode_CreateDicomParentIsInstance, "Trying to attach a new DICOM instance to an instance (must be a series, study or patient)"); |
|
e2675b37eb01
Under Windows, the exit status of Orthanc corresponds to the encountered error code
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1733
diff
changeset
|
619 PrintErrorCode(ErrorCode_CreateDicomParentEncoding, "Unable to get the encoding of the parent resource"); |
|
e2675b37eb01
Under Windows, the exit status of Orthanc corresponds to the encountered error code
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1733
diff
changeset
|
620 PrintErrorCode(ErrorCode_UnknownModality, "Unknown modality"); |
|
e2675b37eb01
Under Windows, the exit status of Orthanc corresponds to the encountered error code
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1733
diff
changeset
|
621 PrintErrorCode(ErrorCode_BadJobOrdering, "Bad ordering of filters in a job"); |
|
e2675b37eb01
Under Windows, the exit status of Orthanc corresponds to the encountered error code
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1733
diff
changeset
|
622 PrintErrorCode(ErrorCode_JsonToLuaTable, "Cannot convert the given JSON object to a Lua table"); |
|
e2675b37eb01
Under Windows, the exit status of Orthanc corresponds to the encountered error code
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1733
diff
changeset
|
623 PrintErrorCode(ErrorCode_CannotCreateLua, "Cannot create the Lua context"); |
|
e2675b37eb01
Under Windows, the exit status of Orthanc corresponds to the encountered error code
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1733
diff
changeset
|
624 PrintErrorCode(ErrorCode_CannotExecuteLua, "Cannot execute a Lua command"); |
|
e2675b37eb01
Under Windows, the exit status of Orthanc corresponds to the encountered error code
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1733
diff
changeset
|
625 PrintErrorCode(ErrorCode_LuaAlreadyExecuted, "Arguments cannot be pushed after the Lua function is executed"); |
|
e2675b37eb01
Under Windows, the exit status of Orthanc corresponds to the encountered error code
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1733
diff
changeset
|
626 PrintErrorCode(ErrorCode_LuaBadOutput, "The Lua function does not give the expected number of outputs"); |
|
e2675b37eb01
Under Windows, the exit status of Orthanc corresponds to the encountered error code
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1733
diff
changeset
|
627 PrintErrorCode(ErrorCode_NotLuaPredicate, "The Lua function is not a predicate (only true/false outputs allowed)"); |
|
e2675b37eb01
Under Windows, the exit status of Orthanc corresponds to the encountered error code
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1733
diff
changeset
|
628 PrintErrorCode(ErrorCode_LuaReturnsNoString, "The Lua function does not return a string"); |
|
e2675b37eb01
Under Windows, the exit status of Orthanc corresponds to the encountered error code
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1733
diff
changeset
|
629 PrintErrorCode(ErrorCode_StorageAreaAlreadyRegistered, "Another plugin has already registered a custom storage area"); |
|
e2675b37eb01
Under Windows, the exit status of Orthanc corresponds to the encountered error code
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1733
diff
changeset
|
630 PrintErrorCode(ErrorCode_DatabaseBackendAlreadyRegistered, "Another plugin has already registered a custom database back-end"); |
|
e2675b37eb01
Under Windows, the exit status of Orthanc corresponds to the encountered error code
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1733
diff
changeset
|
631 PrintErrorCode(ErrorCode_DatabaseNotInitialized, "Plugin trying to call the database during its initialization"); |
|
e2675b37eb01
Under Windows, the exit status of Orthanc corresponds to the encountered error code
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1733
diff
changeset
|
632 PrintErrorCode(ErrorCode_SslDisabled, "Orthanc has been built without SSL support"); |
|
e2675b37eb01
Under Windows, the exit status of Orthanc corresponds to the encountered error code
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1733
diff
changeset
|
633 PrintErrorCode(ErrorCode_CannotOrderSlices, "Unable to order the slices of the series"); |
|
1786
164d78911382
primitives to handle dicom worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1781
diff
changeset
|
634 PrintErrorCode(ErrorCode_NoWorklistHandler, "No request handler factory for DICOM C-Find Modality SCP"); |
|
1980
ebce5f456b8e
new error code: ErrorCode_AlreadyExistingTag
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1965
diff
changeset
|
635 PrintErrorCode(ErrorCode_AlreadyExistingTag, "Cannot override the value of a tag that already exists"); |
| 1733 | 636 } |
| 637 | |
| 638 std::cout << std::endl; | |
| 639 } | |
| 640 | |
| 641 | |
|
893
f57802f8b4dc
plugins for windows
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
831
diff
changeset
|
642 |
|
f57802f8b4dc
plugins for windows
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
831
diff
changeset
|
643 static void LoadLuaScripts(ServerContext& context) |
|
f57802f8b4dc
plugins for windows
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
831
diff
changeset
|
644 { |
|
f57802f8b4dc
plugins for windows
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
831
diff
changeset
|
645 std::list<std::string> luaScripts; |
|
f57802f8b4dc
plugins for windows
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
831
diff
changeset
|
646 Configuration::GetGlobalListOfStringsParameter(luaScripts, "LuaScripts"); |
|
f57802f8b4dc
plugins for windows
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
831
diff
changeset
|
647 for (std::list<std::string>::const_iterator |
|
f57802f8b4dc
plugins for windows
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
831
diff
changeset
|
648 it = luaScripts.begin(); it != luaScripts.end(); ++it) |
|
f57802f8b4dc
plugins for windows
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
831
diff
changeset
|
649 { |
|
f57802f8b4dc
plugins for windows
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
831
diff
changeset
|
650 std::string path = Configuration::InterpretStringParameterAsPath(*it); |
|
f57802f8b4dc
plugins for windows
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
831
diff
changeset
|
651 LOG(WARNING) << "Installing the Lua scripts from: " << path; |
|
f57802f8b4dc
plugins for windows
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
831
diff
changeset
|
652 std::string script; |
| 2140 | 653 SystemToolbox::ReadFile(script, path); |
|
1018
564e39d6df13
integration mainline->lua-scripting
Sebastien Jodogne <s.jodogne@gmail.com>
diff
changeset
|
654 |
|
1433
461e7554bff7
refactoring: LuaScripting
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1368
diff
changeset
|
655 LuaScripting::Locker locker(context.GetLua()); |
|
1018
564e39d6df13
integration mainline->lua-scripting
Sebastien Jodogne <s.jodogne@gmail.com>
diff
changeset
|
656 locker.GetLua().Execute(script); |
|
893
f57802f8b4dc
plugins for windows
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
831
diff
changeset
|
657 } |
|
f57802f8b4dc
plugins for windows
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
831
diff
changeset
|
658 } |
|
f57802f8b4dc
plugins for windows
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
831
diff
changeset
|
659 |
|
f57802f8b4dc
plugins for windows
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
831
diff
changeset
|
660 |
|
1632
eb8fbcf008b5
fix build with plugins disabled
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1630
diff
changeset
|
661 |
|
2136
dd609a99d39a
uniformization of the macro naming
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2133
diff
changeset
|
662 #if ORTHANC_ENABLE_PLUGINS == 1 |
|
1434
f9cd40166269
refactoring of OrthancPlugins, improvement in ServeFolders
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1433
diff
changeset
|
663 static void LoadPlugins(OrthancPlugins& plugins) |
|
893
f57802f8b4dc
plugins for windows
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
831
diff
changeset
|
664 { |
|
1434
f9cd40166269
refactoring of OrthancPlugins, improvement in ServeFolders
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1433
diff
changeset
|
665 std::list<std::string> path; |
|
f9cd40166269
refactoring of OrthancPlugins, improvement in ServeFolders
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1433
diff
changeset
|
666 Configuration::GetGlobalListOfStringsParameter(path, "Plugins"); |
|
893
f57802f8b4dc
plugins for windows
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
831
diff
changeset
|
667 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
|
668 it = path.begin(); it != path.end(); ++it) |
|
893
f57802f8b4dc
plugins for windows
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
831
diff
changeset
|
669 { |
|
f57802f8b4dc
plugins for windows
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
831
diff
changeset
|
670 std::string path = Configuration::InterpretStringParameterAsPath(*it); |
|
1321
0f9e0e808e0f
more explicit message
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1310
diff
changeset
|
671 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
|
672 plugins.GetManager().RegisterPlugin(path); |
|
893
f57802f8b4dc
plugins for windows
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
831
diff
changeset
|
673 } |
|
f57802f8b4dc
plugins for windows
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
831
diff
changeset
|
674 } |
|
1632
eb8fbcf008b5
fix build with plugins disabled
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1630
diff
changeset
|
675 #endif |
|
893
f57802f8b4dc
plugins for windows
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
831
diff
changeset
|
676 |
|
f57802f8b4dc
plugins for windows
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
831
diff
changeset
|
677 |
|
f57802f8b4dc
plugins for windows
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
831
diff
changeset
|
678 |
|
1452
b737acb13da5
refactoring of the main function
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1447
diff
changeset
|
679 // Returns "true" if restart is required |
|
b737acb13da5
refactoring of the main function
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1447
diff
changeset
|
680 static bool WaitForExit(ServerContext& context, |
|
b737acb13da5
refactoring of the main function
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1447
diff
changeset
|
681 OrthancRestApi& restApi) |
|
b737acb13da5
refactoring of the main function
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1447
diff
changeset
|
682 { |
|
b737acb13da5
refactoring of the main function
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1447
diff
changeset
|
683 LOG(WARNING) << "Orthanc has started"; |
|
b737acb13da5
refactoring of the main function
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1447
diff
changeset
|
684 |
|
2136
dd609a99d39a
uniformization of the macro naming
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2133
diff
changeset
|
685 #if ORTHANC_ENABLE_PLUGINS == 1 |
|
1741
06addfcd1d4c
OrthancStarted and OrthancStopped events in plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1734
diff
changeset
|
686 if (context.HasPlugins()) |
|
06addfcd1d4c
OrthancStarted and OrthancStopped events in plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1734
diff
changeset
|
687 { |
|
06addfcd1d4c
OrthancStarted and OrthancStopped events in plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1734
diff
changeset
|
688 context.GetPlugins().SignalOrthancStarted(); |
|
06addfcd1d4c
OrthancStarted and OrthancStopped events in plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1734
diff
changeset
|
689 } |
|
06addfcd1d4c
OrthancStarted and OrthancStopped events in plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1734
diff
changeset
|
690 #endif |
|
06addfcd1d4c
OrthancStarted and OrthancStopped events in plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1734
diff
changeset
|
691 |
|
1455
a68545767975
Initialize() and Finalize() events in Lua
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1452
diff
changeset
|
692 context.GetLua().Execute("Initialize"); |
|
a68545767975
Initialize() and Finalize() events in Lua
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1452
diff
changeset
|
693 |
|
2010
4dafe2a0d3ab
Support of SIGHUP signal (restart Orthanc only if the configuration files have changed)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2009
diff
changeset
|
694 bool restart; |
|
4dafe2a0d3ab
Support of SIGHUP signal (restart Orthanc only if the configuration files have changed)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2009
diff
changeset
|
695 |
|
4dafe2a0d3ab
Support of SIGHUP signal (restart Orthanc only if the configuration files have changed)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2009
diff
changeset
|
696 for (;;) |
|
4dafe2a0d3ab
Support of SIGHUP signal (restart Orthanc only if the configuration files have changed)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2009
diff
changeset
|
697 { |
| 2140 | 698 ServerBarrierEvent event = SystemToolbox::ServerBarrier(restApi.LeaveBarrierFlag()); |
|
2010
4dafe2a0d3ab
Support of SIGHUP signal (restart Orthanc only if the configuration files have changed)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2009
diff
changeset
|
699 restart = restApi.IsResetRequestReceived(); |
|
1452
b737acb13da5
refactoring of the main function
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1447
diff
changeset
|
700 |
|
2010
4dafe2a0d3ab
Support of SIGHUP signal (restart Orthanc only if the configuration files have changed)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2009
diff
changeset
|
701 if (!restart && |
|
4dafe2a0d3ab
Support of SIGHUP signal (restart Orthanc only if the configuration files have changed)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2009
diff
changeset
|
702 event == ServerBarrierEvent_Reload) |
|
4dafe2a0d3ab
Support of SIGHUP signal (restart Orthanc only if the configuration files have changed)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2009
diff
changeset
|
703 { |
|
2015
bcc575732aef
New option "--logfile" to output the Orthanc log to the given file
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2010
diff
changeset
|
704 // Handling of SIGHUP |
|
bcc575732aef
New option "--logfile" to output the Orthanc log to the given file
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2010
diff
changeset
|
705 |
|
2010
4dafe2a0d3ab
Support of SIGHUP signal (restart Orthanc only if the configuration files have changed)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2009
diff
changeset
|
706 if (Configuration::HasConfigurationChanged()) |
|
4dafe2a0d3ab
Support of SIGHUP signal (restart Orthanc only if the configuration files have changed)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2009
diff
changeset
|
707 { |
|
4dafe2a0d3ab
Support of SIGHUP signal (restart Orthanc only if the configuration files have changed)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2009
diff
changeset
|
708 LOG(WARNING) << "A SIGHUP signal has been received, resetting Orthanc"; |
|
2015
bcc575732aef
New option "--logfile" to output the Orthanc log to the given file
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2010
diff
changeset
|
709 Logging::Flush(); |
|
2010
4dafe2a0d3ab
Support of SIGHUP signal (restart Orthanc only if the configuration files have changed)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2009
diff
changeset
|
710 restart = true; |
|
4dafe2a0d3ab
Support of SIGHUP signal (restart Orthanc only if the configuration files have changed)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2009
diff
changeset
|
711 break; |
|
4dafe2a0d3ab
Support of SIGHUP signal (restart Orthanc only if the configuration files have changed)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2009
diff
changeset
|
712 } |
|
4dafe2a0d3ab
Support of SIGHUP signal (restart Orthanc only if the configuration files have changed)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2009
diff
changeset
|
713 else |
|
4dafe2a0d3ab
Support of SIGHUP signal (restart Orthanc only if the configuration files have changed)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2009
diff
changeset
|
714 { |
|
4dafe2a0d3ab
Support of SIGHUP signal (restart Orthanc only if the configuration files have changed)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2009
diff
changeset
|
715 LOG(WARNING) << "A SIGHUP signal has been received, but is ignored as the configuration has not changed"; |
|
2015
bcc575732aef
New option "--logfile" to output the Orthanc log to the given file
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2010
diff
changeset
|
716 Logging::Flush(); |
|
2010
4dafe2a0d3ab
Support of SIGHUP signal (restart Orthanc only if the configuration files have changed)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2009
diff
changeset
|
717 continue; |
|
4dafe2a0d3ab
Support of SIGHUP signal (restart Orthanc only if the configuration files have changed)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2009
diff
changeset
|
718 } |
|
4dafe2a0d3ab
Support of SIGHUP signal (restart Orthanc only if the configuration files have changed)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2009
diff
changeset
|
719 } |
|
4dafe2a0d3ab
Support of SIGHUP signal (restart Orthanc only if the configuration files have changed)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2009
diff
changeset
|
720 else |
|
4dafe2a0d3ab
Support of SIGHUP signal (restart Orthanc only if the configuration files have changed)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2009
diff
changeset
|
721 { |
|
4dafe2a0d3ab
Support of SIGHUP signal (restart Orthanc only if the configuration files have changed)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2009
diff
changeset
|
722 break; |
|
4dafe2a0d3ab
Support of SIGHUP signal (restart Orthanc only if the configuration files have changed)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2009
diff
changeset
|
723 } |
|
2009
e2dd40abce72
catching SIGHUP signal
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2000
diff
changeset
|
724 } |
|
e2dd40abce72
catching SIGHUP signal
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2000
diff
changeset
|
725 |
|
1455
a68545767975
Initialize() and Finalize() events in Lua
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1452
diff
changeset
|
726 context.GetLua().Execute("Finalize"); |
|
a68545767975
Initialize() and Finalize() events in Lua
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1452
diff
changeset
|
727 |
|
2136
dd609a99d39a
uniformization of the macro naming
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2133
diff
changeset
|
728 #if ORTHANC_ENABLE_PLUGINS == 1 |
|
1741
06addfcd1d4c
OrthancStarted and OrthancStopped events in plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1734
diff
changeset
|
729 if (context.HasPlugins()) |
|
06addfcd1d4c
OrthancStarted and OrthancStopped events in plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1734
diff
changeset
|
730 { |
|
06addfcd1d4c
OrthancStarted and OrthancStopped events in plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1734
diff
changeset
|
731 context.GetPlugins().SignalOrthancStopped(); |
|
06addfcd1d4c
OrthancStarted and OrthancStopped events in plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1734
diff
changeset
|
732 } |
|
06addfcd1d4c
OrthancStarted and OrthancStopped events in plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1734
diff
changeset
|
733 #endif |
|
06addfcd1d4c
OrthancStarted and OrthancStopped events in plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1734
diff
changeset
|
734 |
|
1452
b737acb13da5
refactoring of the main function
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1447
diff
changeset
|
735 if (restart) |
|
b737acb13da5
refactoring of the main function
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1447
diff
changeset
|
736 { |
|
b737acb13da5
refactoring of the main function
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1447
diff
changeset
|
737 LOG(WARNING) << "Reset request received, restarting Orthanc"; |
|
b737acb13da5
refactoring of the main function
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1447
diff
changeset
|
738 } |
|
b737acb13da5
refactoring of the main function
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1447
diff
changeset
|
739 |
|
b737acb13da5
refactoring of the main function
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1447
diff
changeset
|
740 // We're done |
|
b737acb13da5
refactoring of the main function
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1447
diff
changeset
|
741 LOG(WARNING) << "Orthanc is stopping"; |
|
b737acb13da5
refactoring of the main function
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1447
diff
changeset
|
742 |
|
b737acb13da5
refactoring of the main function
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1447
diff
changeset
|
743 return restart; |
|
b737acb13da5
refactoring of the main function
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1447
diff
changeset
|
744 } |
|
b737acb13da5
refactoring of the main function
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1447
diff
changeset
|
745 |
| 1368 | 746 |
| 747 | |
|
1452
b737acb13da5
refactoring of the main function
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1447
diff
changeset
|
748 static bool StartHttpServer(ServerContext& context, |
|
1645
1558b3226b18
IHttpExceptionFormatter
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1632
diff
changeset
|
749 OrthancRestApi& restApi, |
|
1558b3226b18
IHttpExceptionFormatter
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1632
diff
changeset
|
750 OrthancPlugins* plugins) |
|
1103
bec1eccf976c
Hot restart of Orthanc
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1102
diff
changeset
|
751 { |
|
1452
b737acb13da5
refactoring of the main function
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1447
diff
changeset
|
752 if (!Configuration::GetGlobalBoolParameter("HttpServerEnabled", true)) |
|
b737acb13da5
refactoring of the main function
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1447
diff
changeset
|
753 { |
|
b737acb13da5
refactoring of the main function
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1447
diff
changeset
|
754 LOG(WARNING) << "The HTTP server is disabled"; |
|
b737acb13da5
refactoring of the main function
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1447
diff
changeset
|
755 return WaitForExit(context, restApi); |
|
b737acb13da5
refactoring of the main function
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1447
diff
changeset
|
756 } |
| 1247 | 757 |
|
1645
1558b3226b18
IHttpExceptionFormatter
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1632
diff
changeset
|
758 MyHttpExceptionFormatter exceptionFormatter(Configuration::GetGlobalBoolParameter("HttpDescribeErrors", true), plugins); |
|
1558b3226b18
IHttpExceptionFormatter
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1632
diff
changeset
|
759 |
|
1558b3226b18
IHttpExceptionFormatter
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1632
diff
changeset
|
760 |
|
1452
b737acb13da5
refactoring of the main function
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1447
diff
changeset
|
761 // HTTP server |
| 1962 | 762 MyIncomingHttpRequestFilter httpFilter(context, plugins); |
|
1452
b737acb13da5
refactoring of the main function
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1447
diff
changeset
|
763 MongooseServer httpServer; |
|
2069
fabf7820d1f1
New configuration options: "DicomScuTimeout" and "DicomScpTimeout" + validation of non-negative options
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2018
diff
changeset
|
764 httpServer.SetPortNumber(Configuration::GetGlobalUnsignedIntegerParameter("HttpPort", 8042)); |
|
1452
b737acb13da5
refactoring of the main function
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1447
diff
changeset
|
765 httpServer.SetRemoteAccessAllowed(Configuration::GetGlobalBoolParameter("RemoteAccessAllowed", false)); |
|
b737acb13da5
refactoring of the main function
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1447
diff
changeset
|
766 httpServer.SetKeepAliveEnabled(Configuration::GetGlobalBoolParameter("KeepAlive", false)); |
| 1517 | 767 httpServer.SetHttpCompressionEnabled(Configuration::GetGlobalBoolParameter("HttpCompressionEnabled", true)); |
|
1452
b737acb13da5
refactoring of the main function
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1447
diff
changeset
|
768 httpServer.SetIncomingHttpRequestFilter(httpFilter); |
|
1645
1558b3226b18
IHttpExceptionFormatter
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1632
diff
changeset
|
769 httpServer.SetHttpExceptionFormatter(exceptionFormatter); |
|
1127
f4e65808ea58
FilesystemStorageWithoutDicom
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1124
diff
changeset
|
770 |
|
1452
b737acb13da5
refactoring of the main function
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1447
diff
changeset
|
771 httpServer.SetAuthenticationEnabled(Configuration::GetGlobalBoolParameter("AuthenticationEnabled", false)); |
|
b737acb13da5
refactoring of the main function
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1447
diff
changeset
|
772 Configuration::SetupRegisteredUsers(httpServer); |
|
b737acb13da5
refactoring of the main function
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1447
diff
changeset
|
773 |
|
b737acb13da5
refactoring of the main function
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1447
diff
changeset
|
774 if (Configuration::GetGlobalBoolParameter("SslEnabled", false)) |
|
1310
61ce8147f30d
custom database back-end
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1289
diff
changeset
|
775 { |
|
1452
b737acb13da5
refactoring of the main function
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1447
diff
changeset
|
776 std::string certificate = Configuration::InterpretStringParameterAsPath( |
|
b737acb13da5
refactoring of the main function
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1447
diff
changeset
|
777 Configuration::GetGlobalStringParameter("SslCertificate", "certificate.pem")); |
|
b737acb13da5
refactoring of the main function
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1447
diff
changeset
|
778 httpServer.SetSslEnabled(true); |
|
b737acb13da5
refactoring of the main function
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1447
diff
changeset
|
779 httpServer.SetSslCertificate(certificate.c_str()); |
|
1310
61ce8147f30d
custom database back-end
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1289
diff
changeset
|
780 } |
|
61ce8147f30d
custom database back-end
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1289
diff
changeset
|
781 else |
|
61ce8147f30d
custom database back-end
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1289
diff
changeset
|
782 { |
|
1452
b737acb13da5
refactoring of the main function
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1447
diff
changeset
|
783 httpServer.SetSslEnabled(false); |
|
1310
61ce8147f30d
custom database back-end
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1289
diff
changeset
|
784 } |
|
1103
bec1eccf976c
Hot restart of Orthanc
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1102
diff
changeset
|
785 |
|
1452
b737acb13da5
refactoring of the main function
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1447
diff
changeset
|
786 httpServer.Register(context.GetHttpHandler()); |
|
1310
61ce8147f30d
custom database back-end
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1289
diff
changeset
|
787 |
|
1949
d90f737f2dde
warn about the use of privileged ports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1900
diff
changeset
|
788 if (httpServer.GetPortNumber() < 1024) |
|
d90f737f2dde
warn about the use of privileged ports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1900
diff
changeset
|
789 { |
|
d90f737f2dde
warn about the use of privileged ports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1900
diff
changeset
|
790 LOG(WARNING) << "The HTTP port is privileged (" |
|
d90f737f2dde
warn about the use of privileged ports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1900
diff
changeset
|
791 << httpServer.GetPortNumber() << " is below 1024), " |
|
d90f737f2dde
warn about the use of privileged ports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1900
diff
changeset
|
792 << "make sure you run Orthanc as root/administrator"; |
|
d90f737f2dde
warn about the use of privileged ports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1900
diff
changeset
|
793 } |
|
d90f737f2dde
warn about the use of privileged ports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1900
diff
changeset
|
794 |
|
1452
b737acb13da5
refactoring of the main function
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1447
diff
changeset
|
795 httpServer.Start(); |
|
b737acb13da5
refactoring of the main function
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1447
diff
changeset
|
796 |
|
b737acb13da5
refactoring of the main function
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1447
diff
changeset
|
797 bool restart = WaitForExit(context, restApi); |
|
b737acb13da5
refactoring of the main function
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1447
diff
changeset
|
798 |
|
b737acb13da5
refactoring of the main function
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1447
diff
changeset
|
799 httpServer.Stop(); |
|
b737acb13da5
refactoring of the main function
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1447
diff
changeset
|
800 LOG(WARNING) << " HTTP server has stopped"; |
|
1103
bec1eccf976c
Hot restart of Orthanc
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1102
diff
changeset
|
801 |
|
1452
b737acb13da5
refactoring of the main function
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1447
diff
changeset
|
802 return restart; |
|
b737acb13da5
refactoring of the main function
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1447
diff
changeset
|
803 } |
|
b737acb13da5
refactoring of the main function
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1447
diff
changeset
|
804 |
|
b737acb13da5
refactoring of the main function
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1447
diff
changeset
|
805 |
|
b737acb13da5
refactoring of the main function
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1447
diff
changeset
|
806 static bool StartDicomServer(ServerContext& context, |
|
1645
1558b3226b18
IHttpExceptionFormatter
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1632
diff
changeset
|
807 OrthancRestApi& restApi, |
|
1558b3226b18
IHttpExceptionFormatter
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1632
diff
changeset
|
808 OrthancPlugins* plugins) |
|
1452
b737acb13da5
refactoring of the main function
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1447
diff
changeset
|
809 { |
|
b737acb13da5
refactoring of the main function
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1447
diff
changeset
|
810 if (!Configuration::GetGlobalBoolParameter("DicomServerEnabled", true)) |
|
1103
bec1eccf976c
Hot restart of Orthanc
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1102
diff
changeset
|
811 { |
|
1452
b737acb13da5
refactoring of the main function
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1447
diff
changeset
|
812 LOG(WARNING) << "The DICOM server is disabled"; |
|
1645
1558b3226b18
IHttpExceptionFormatter
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1632
diff
changeset
|
813 return StartHttpServer(context, restApi, plugins); |
|
1103
bec1eccf976c
Hot restart of Orthanc
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1102
diff
changeset
|
814 } |
|
bec1eccf976c
Hot restart of Orthanc
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1102
diff
changeset
|
815 |
|
1452
b737acb13da5
refactoring of the main function
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1447
diff
changeset
|
816 MyDicomServerFactory serverFactory(context); |
|
2381
b8969010b534
uncoupling DCMTK primitives from Orthanc::Configuration
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2375
diff
changeset
|
817 OrthancApplicationEntityFilter dicomFilter(context); |
|
b8969010b534
uncoupling DCMTK primitives from Orthanc::Configuration
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2375
diff
changeset
|
818 ModalitiesFromConfiguration modalities; |
|
b8969010b534
uncoupling DCMTK primitives from Orthanc::Configuration
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2375
diff
changeset
|
819 |
|
b8969010b534
uncoupling DCMTK primitives from Orthanc::Configuration
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2375
diff
changeset
|
820 // Setup the DICOM server |
|
1452
b737acb13da5
refactoring of the main function
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1447
diff
changeset
|
821 DicomServer dicomServer; |
|
2381
b8969010b534
uncoupling DCMTK primitives from Orthanc::Configuration
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2375
diff
changeset
|
822 dicomServer.SetRemoteModalities(modalities); |
|
1452
b737acb13da5
refactoring of the main function
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1447
diff
changeset
|
823 dicomServer.SetCalledApplicationEntityTitleCheck(Configuration::GetGlobalBoolParameter("DicomCheckCalledAet", false)); |
|
b737acb13da5
refactoring of the main function
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1447
diff
changeset
|
824 dicomServer.SetStoreRequestHandlerFactory(serverFactory); |
|
b737acb13da5
refactoring of the main function
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1447
diff
changeset
|
825 dicomServer.SetMoveRequestHandlerFactory(serverFactory); |
|
b737acb13da5
refactoring of the main function
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1447
diff
changeset
|
826 dicomServer.SetFindRequestHandlerFactory(serverFactory); |
|
2069
fabf7820d1f1
New configuration options: "DicomScuTimeout" and "DicomScpTimeout" + validation of non-negative options
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2018
diff
changeset
|
827 dicomServer.SetAssociationTimeout(Configuration::GetGlobalUnsignedIntegerParameter("DicomScpTimeout", 30)); |
|
fabf7820d1f1
New configuration options: "DicomScuTimeout" and "DicomScpTimeout" + validation of non-negative options
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2018
diff
changeset
|
828 |
|
1786
164d78911382
primitives to handle dicom worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1781
diff
changeset
|
829 |
|
2136
dd609a99d39a
uniformization of the macro naming
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2133
diff
changeset
|
830 #if ORTHANC_ENABLE_PLUGINS == 1 |
|
1995
f0acfa753973
New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1987
diff
changeset
|
831 if (plugins != NULL) |
|
1800
30e97a1f4093
callback for handling worklists with plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1799
diff
changeset
|
832 { |
|
1995
f0acfa753973
New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1987
diff
changeset
|
833 if (plugins->HasWorklistHandler()) |
|
f0acfa753973
New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1987
diff
changeset
|
834 { |
|
f0acfa753973
New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1987
diff
changeset
|
835 dicomServer.SetWorklistRequestHandlerFactory(*plugins); |
|
f0acfa753973
New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1987
diff
changeset
|
836 } |
|
f0acfa753973
New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1987
diff
changeset
|
837 |
|
f0acfa753973
New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1987
diff
changeset
|
838 if (plugins->HasFindHandler()) |
|
f0acfa753973
New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1987
diff
changeset
|
839 { |
|
f0acfa753973
New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1987
diff
changeset
|
840 dicomServer.SetFindRequestHandlerFactory(*plugins); |
|
f0acfa753973
New callback to handle non-worklists C-Find requests: OrthancPluginRegisterCFindCallback()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1987
diff
changeset
|
841 } |
|
1999
364cc624eb65
New URI "/modalities/.../move" to issue C-Move SCU requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1995
diff
changeset
|
842 |
|
364cc624eb65
New URI "/modalities/.../move" to issue C-Move SCU requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1995
diff
changeset
|
843 if (plugins->HasMoveHandler()) |
|
364cc624eb65
New URI "/modalities/.../move" to issue C-Move SCU requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1995
diff
changeset
|
844 { |
|
364cc624eb65
New URI "/modalities/.../move" to issue C-Move SCU requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1995
diff
changeset
|
845 dicomServer.SetMoveRequestHandlerFactory(*plugins); |
|
364cc624eb65
New URI "/modalities/.../move" to issue C-Move SCU requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1995
diff
changeset
|
846 } |
|
1800
30e97a1f4093
callback for handling worklists with plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1799
diff
changeset
|
847 } |
|
30e97a1f4093
callback for handling worklists with plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1799
diff
changeset
|
848 #endif |
|
1786
164d78911382
primitives to handle dicom worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1781
diff
changeset
|
849 |
|
2069
fabf7820d1f1
New configuration options: "DicomScuTimeout" and "DicomScpTimeout" + validation of non-negative options
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2018
diff
changeset
|
850 dicomServer.SetPortNumber(Configuration::GetGlobalUnsignedIntegerParameter("DicomPort", 4242)); |
|
1452
b737acb13da5
refactoring of the main function
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1447
diff
changeset
|
851 dicomServer.SetApplicationEntityTitle(Configuration::GetGlobalStringParameter("DicomAet", "ORTHANC")); |
|
b737acb13da5
refactoring of the main function
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1447
diff
changeset
|
852 dicomServer.SetApplicationEntityFilter(dicomFilter); |
|
b737acb13da5
refactoring of the main function
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1447
diff
changeset
|
853 |
|
1949
d90f737f2dde
warn about the use of privileged ports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1900
diff
changeset
|
854 if (dicomServer.GetPortNumber() < 1024) |
|
d90f737f2dde
warn about the use of privileged ports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1900
diff
changeset
|
855 { |
|
d90f737f2dde
warn about the use of privileged ports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1900
diff
changeset
|
856 LOG(WARNING) << "The DICOM port is privileged (" |
|
d90f737f2dde
warn about the use of privileged ports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1900
diff
changeset
|
857 << dicomServer.GetPortNumber() << " is below 1024), " |
|
d90f737f2dde
warn about the use of privileged ports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1900
diff
changeset
|
858 << "make sure you run Orthanc as root/administrator"; |
|
d90f737f2dde
warn about the use of privileged ports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1900
diff
changeset
|
859 } |
|
d90f737f2dde
warn about the use of privileged ports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1900
diff
changeset
|
860 |
|
1452
b737acb13da5
refactoring of the main function
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1447
diff
changeset
|
861 dicomServer.Start(); |
|
1851
d364926389e0
OrthancFindRequestHandler::FilterQueryTag
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1809
diff
changeset
|
862 LOG(WARNING) << "DICOM server listening with AET " << dicomServer.GetApplicationEntityTitle() |
|
d364926389e0
OrthancFindRequestHandler::FilterQueryTag
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1809
diff
changeset
|
863 << " on port: " << dicomServer.GetPortNumber(); |
|
1452
b737acb13da5
refactoring of the main function
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1447
diff
changeset
|
864 |
|
1965
877713b3a91c
fix possibly uninitialized variable
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1962
diff
changeset
|
865 bool restart = false; |
|
1675
131136aeeaa7
improved exception handling in the main program
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1672
diff
changeset
|
866 ErrorCode error = ErrorCode_Success; |
|
131136aeeaa7
improved exception handling in the main program
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1672
diff
changeset
|
867 |
|
131136aeeaa7
improved exception handling in the main program
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1672
diff
changeset
|
868 try |
|
131136aeeaa7
improved exception handling in the main program
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1672
diff
changeset
|
869 { |
|
131136aeeaa7
improved exception handling in the main program
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1672
diff
changeset
|
870 restart = StartHttpServer(context, restApi, plugins); |
|
131136aeeaa7
improved exception handling in the main program
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1672
diff
changeset
|
871 } |
|
131136aeeaa7
improved exception handling in the main program
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1672
diff
changeset
|
872 catch (OrthancException& e) |
|
131136aeeaa7
improved exception handling in the main program
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1672
diff
changeset
|
873 { |
|
131136aeeaa7
improved exception handling in the main program
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1672
diff
changeset
|
874 error = e.GetErrorCode(); |
|
131136aeeaa7
improved exception handling in the main program
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1672
diff
changeset
|
875 } |
|
1452
b737acb13da5
refactoring of the main function
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1447
diff
changeset
|
876 |
|
b737acb13da5
refactoring of the main function
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1447
diff
changeset
|
877 dicomServer.Stop(); |
|
b737acb13da5
refactoring of the main function
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1447
diff
changeset
|
878 LOG(WARNING) << " DICOM server has stopped"; |
|
b737acb13da5
refactoring of the main function
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1447
diff
changeset
|
879 |
|
b737acb13da5
refactoring of the main function
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1447
diff
changeset
|
880 serverFactory.Done(); |
|
b737acb13da5
refactoring of the main function
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1447
diff
changeset
|
881 |
|
1675
131136aeeaa7
improved exception handling in the main program
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1672
diff
changeset
|
882 if (error != ErrorCode_Success) |
|
131136aeeaa7
improved exception handling in the main program
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1672
diff
changeset
|
883 { |
|
131136aeeaa7
improved exception handling in the main program
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1672
diff
changeset
|
884 throw OrthancException(error); |
|
131136aeeaa7
improved exception handling in the main program
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1672
diff
changeset
|
885 } |
|
131136aeeaa7
improved exception handling in the main program
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1672
diff
changeset
|
886 |
|
1452
b737acb13da5
refactoring of the main function
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1447
diff
changeset
|
887 return restart; |
|
b737acb13da5
refactoring of the main function
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1447
diff
changeset
|
888 } |
|
b737acb13da5
refactoring of the main function
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1447
diff
changeset
|
889 |
|
b737acb13da5
refactoring of the main function
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1447
diff
changeset
|
890 |
|
b737acb13da5
refactoring of the main function
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1447
diff
changeset
|
891 static bool ConfigureHttpHandler(ServerContext& context, |
|
b737acb13da5
refactoring of the main function
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1447
diff
changeset
|
892 OrthancPlugins *plugins) |
|
b737acb13da5
refactoring of the main function
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1447
diff
changeset
|
893 { |
|
2136
dd609a99d39a
uniformization of the macro naming
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2133
diff
changeset
|
894 #if ORTHANC_ENABLE_PLUGINS == 1 |
|
1452
b737acb13da5
refactoring of the main function
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1447
diff
changeset
|
895 // 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
|
896 // 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
|
897 if (plugins) |
|
1103
bec1eccf976c
Hot restart of Orthanc
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1102
diff
changeset
|
898 { |
|
1452
b737acb13da5
refactoring of the main function
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1447
diff
changeset
|
899 assert(context.HasPlugins()); |
|
b737acb13da5
refactoring of the main function
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1447
diff
changeset
|
900 context.GetHttpHandler().Register(*plugins, false); |
|
1103
bec1eccf976c
Hot restart of Orthanc
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1102
diff
changeset
|
901 } |
|
1632
eb8fbcf008b5
fix build with plugins disabled
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1630
diff
changeset
|
902 #endif |
|
1103
bec1eccf976c
Hot restart of Orthanc
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1102
diff
changeset
|
903 |
|
1452
b737acb13da5
refactoring of the main function
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1447
diff
changeset
|
904 // Secondly, apply the "static resources" layer |
|
1443
895ab369d63c
refactoring: OrthancHttpHandler
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1437
diff
changeset
|
905 #if ORTHANC_STANDALONE == 1 |
|
895ab369d63c
refactoring: OrthancHttpHandler
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1437
diff
changeset
|
906 EmbeddedResourceHttpHandler staticResources("/app", EmbeddedResources::ORTHANC_EXPLORER); |
|
895ab369d63c
refactoring: OrthancHttpHandler
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1437
diff
changeset
|
907 #else |
|
895ab369d63c
refactoring: OrthancHttpHandler
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1437
diff
changeset
|
908 FilesystemHttpHandler staticResources("/app", ORTHANC_PATH "/OrthancExplorer"); |
|
895ab369d63c
refactoring: OrthancHttpHandler
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1437
diff
changeset
|
909 #endif |
|
895ab369d63c
refactoring: OrthancHttpHandler
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1437
diff
changeset
|
910 |
|
1452
b737acb13da5
refactoring of the main function
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1447
diff
changeset
|
911 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
|
912 |
|
1452
b737acb13da5
refactoring of the main function
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1447
diff
changeset
|
913 // 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
|
914 OrthancRestApi restApi(context); |
|
b737acb13da5
refactoring of the main function
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1447
diff
changeset
|
915 context.GetHttpHandler().Register(restApi, true); |
|
1103
bec1eccf976c
Hot restart of Orthanc
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1102
diff
changeset
|
916 |
|
1645
1558b3226b18
IHttpExceptionFormatter
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1632
diff
changeset
|
917 return StartDicomServer(context, restApi, plugins); |
|
1103
bec1eccf976c
Hot restart of Orthanc
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1102
diff
changeset
|
918 } |
|
bec1eccf976c
Hot restart of Orthanc
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1102
diff
changeset
|
919 |
|
bec1eccf976c
Hot restart of Orthanc
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1102
diff
changeset
|
920 |
|
2299
03982a0db696
Fix issue #29 (more consistent handling of the "--upgrade" argument)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2295
diff
changeset
|
921 static void UpgradeDatabase(IDatabaseWrapper& database, |
|
03982a0db696
Fix issue #29 (more consistent handling of the "--upgrade" argument)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2295
diff
changeset
|
922 IStorageArea& storageArea) |
|
1615
c40fe92a68e7
Primitives to upgrade the database version in plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1592
diff
changeset
|
923 { |
|
1668
de1413733c97
reconstructing main dicom tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1666
diff
changeset
|
924 // Upgrade the schema of the database, if needed |
|
1615
c40fe92a68e7
Primitives to upgrade the database version in plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1592
diff
changeset
|
925 unsigned int currentVersion = database.GetDatabaseVersion(); |
|
2299
03982a0db696
Fix issue #29 (more consistent handling of the "--upgrade" argument)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2295
diff
changeset
|
926 |
|
03982a0db696
Fix issue #29 (more consistent handling of the "--upgrade" argument)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2295
diff
changeset
|
927 LOG(WARNING) << "Starting the upgrade of the database schema"; |
|
03982a0db696
Fix issue #29 (more consistent handling of the "--upgrade" argument)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2295
diff
changeset
|
928 LOG(WARNING) << "Current database version: " << currentVersion; |
|
03982a0db696
Fix issue #29 (more consistent handling of the "--upgrade" argument)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2295
diff
changeset
|
929 LOG(WARNING) << "Database version expected by Orthanc: " << ORTHANC_DATABASE_VERSION; |
|
03982a0db696
Fix issue #29 (more consistent handling of the "--upgrade" argument)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2295
diff
changeset
|
930 |
|
1669
a412ad57f0f9
refactoring of sample plugins, OrthancPluginReconstructMainDicomTags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1668
diff
changeset
|
931 if (currentVersion == ORTHANC_DATABASE_VERSION) |
|
1615
c40fe92a68e7
Primitives to upgrade the database version in plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1592
diff
changeset
|
932 { |
|
2299
03982a0db696
Fix issue #29 (more consistent handling of the "--upgrade" argument)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2295
diff
changeset
|
933 LOG(WARNING) << "No upgrade is needed, start Orthanc without the \"--upgrade\" argument"; |
|
03982a0db696
Fix issue #29 (more consistent handling of the "--upgrade" argument)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2295
diff
changeset
|
934 return; |
|
1615
c40fe92a68e7
Primitives to upgrade the database version in plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1592
diff
changeset
|
935 } |
|
c40fe92a68e7
Primitives to upgrade the database version in plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1592
diff
changeset
|
936 |
|
1669
a412ad57f0f9
refactoring of sample plugins, OrthancPluginReconstructMainDicomTags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1668
diff
changeset
|
937 if (currentVersion > ORTHANC_DATABASE_VERSION) |
|
1666
d7039be97eeb
better command-line options handling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1651
diff
changeset
|
938 { |
|
1669
a412ad57f0f9
refactoring of sample plugins, OrthancPluginReconstructMainDicomTags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1668
diff
changeset
|
939 LOG(ERROR) << "The version of the database schema (" << currentVersion |
|
a412ad57f0f9
refactoring of sample plugins, OrthancPluginReconstructMainDicomTags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1668
diff
changeset
|
940 << ") is too recent for this version of Orthanc. Please upgrade Orthanc."; |
|
2299
03982a0db696
Fix issue #29 (more consistent handling of the "--upgrade" argument)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2295
diff
changeset
|
941 throw OrthancException(ErrorCode_IncompatibleDatabaseVersion); |
|
1669
a412ad57f0f9
refactoring of sample plugins, OrthancPluginReconstructMainDicomTags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1668
diff
changeset
|
942 } |
|
a412ad57f0f9
refactoring of sample plugins, OrthancPluginReconstructMainDicomTags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1668
diff
changeset
|
943 |
|
a412ad57f0f9
refactoring of sample plugins, OrthancPluginReconstructMainDicomTags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1668
diff
changeset
|
944 LOG(WARNING) << "Upgrading the database from schema version " |
|
a412ad57f0f9
refactoring of sample plugins, OrthancPluginReconstructMainDicomTags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1668
diff
changeset
|
945 << currentVersion << " to " << ORTHANC_DATABASE_VERSION; |
|
1869
9af3b492b010
invitation to replicate if upgrade fails
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1866
diff
changeset
|
946 |
|
9af3b492b010
invitation to replicate if upgrade fails
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1866
diff
changeset
|
947 try |
|
9af3b492b010
invitation to replicate if upgrade fails
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1866
diff
changeset
|
948 { |
|
9af3b492b010
invitation to replicate if upgrade fails
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1866
diff
changeset
|
949 database.Upgrade(ORTHANC_DATABASE_VERSION, storageArea); |
|
9af3b492b010
invitation to replicate if upgrade fails
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1866
diff
changeset
|
950 } |
|
9af3b492b010
invitation to replicate if upgrade fails
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1866
diff
changeset
|
951 catch (OrthancException&) |
|
9af3b492b010
invitation to replicate if upgrade fails
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1866
diff
changeset
|
952 { |
|
9af3b492b010
invitation to replicate if upgrade fails
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1866
diff
changeset
|
953 LOG(ERROR) << "Unable to run the automated upgrade, please use the replication instructions: " |
| 2158 | 954 << "http://book.orthanc-server.com//users/replication.html"; |
|
1869
9af3b492b010
invitation to replicate if upgrade fails
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1866
diff
changeset
|
955 throw; |
|
9af3b492b010
invitation to replicate if upgrade fails
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1866
diff
changeset
|
956 } |
|
1669
a412ad57f0f9
refactoring of sample plugins, OrthancPluginReconstructMainDicomTags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1668
diff
changeset
|
957 |
|
a412ad57f0f9
refactoring of sample plugins, OrthancPluginReconstructMainDicomTags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1668
diff
changeset
|
958 // Sanity check |
|
a412ad57f0f9
refactoring of sample plugins, OrthancPluginReconstructMainDicomTags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1668
diff
changeset
|
959 currentVersion = database.GetDatabaseVersion(); |
|
a412ad57f0f9
refactoring of sample plugins, OrthancPluginReconstructMainDicomTags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1668
diff
changeset
|
960 if (ORTHANC_DATABASE_VERSION != currentVersion) |
|
a412ad57f0f9
refactoring of sample plugins, OrthancPluginReconstructMainDicomTags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1668
diff
changeset
|
961 { |
|
a412ad57f0f9
refactoring of sample plugins, OrthancPluginReconstructMainDicomTags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1668
diff
changeset
|
962 LOG(ERROR) << "The database schema was not properly upgraded, it is still at version " << currentVersion; |
|
2299
03982a0db696
Fix issue #29 (more consistent handling of the "--upgrade" argument)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2295
diff
changeset
|
963 throw OrthancException(ErrorCode_IncompatibleDatabaseVersion); |
|
1669
a412ad57f0f9
refactoring of sample plugins, OrthancPluginReconstructMainDicomTags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1668
diff
changeset
|
964 } |
|
2299
03982a0db696
Fix issue #29 (more consistent handling of the "--upgrade" argument)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2295
diff
changeset
|
965 else |
|
03982a0db696
Fix issue #29 (more consistent handling of the "--upgrade" argument)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2295
diff
changeset
|
966 { |
|
03982a0db696
Fix issue #29 (more consistent handling of the "--upgrade" argument)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2295
diff
changeset
|
967 LOG(WARNING) << "The database schema was successfully upgraded, " |
|
03982a0db696
Fix issue #29 (more consistent handling of the "--upgrade" argument)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2295
diff
changeset
|
968 << "you can now start Orthanc without the \"--upgrade\" argument"; |
|
03982a0db696
Fix issue #29 (more consistent handling of the "--upgrade" argument)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2295
diff
changeset
|
969 } |
|
1615
c40fe92a68e7
Primitives to upgrade the database version in plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1592
diff
changeset
|
970 } |
|
c40fe92a68e7
Primitives to upgrade the database version in plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1592
diff
changeset
|
971 |
|
c40fe92a68e7
Primitives to upgrade the database version in plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1592
diff
changeset
|
972 |
|
1452
b737acb13da5
refactoring of the main function
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1447
diff
changeset
|
973 static bool ConfigureServerContext(IDatabaseWrapper& database, |
|
b737acb13da5
refactoring of the main function
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1447
diff
changeset
|
974 IStorageArea& storageArea, |
|
1672
4c5a85c3ff43
sample database plugin now working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1669
diff
changeset
|
975 OrthancPlugins *plugins) |
|
1452
b737acb13da5
refactoring of the main function
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1447
diff
changeset
|
976 { |
|
2219
262fcab24024
fix for HttpsCACertificates
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2158
diff
changeset
|
977 // These configuration options must be set before creating the |
|
262fcab24024
fix for HttpsCACertificates
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2158
diff
changeset
|
978 // ServerContext, otherwise the possible Lua scripts will not be |
|
262fcab24024
fix for HttpsCACertificates
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2158
diff
changeset
|
979 // able to properly issue HTTP/HTTPS queries |
|
1987
ce90d109bb64
new plugin functions: OrthancPluginHttpClient and OrthancPluginGenerateUuid
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1982
diff
changeset
|
980 HttpClient::ConfigureSsl(Configuration::GetGlobalBoolParameter("HttpsVerifyPeers", true), |
|
2219
262fcab24024
fix for HttpsCACertificates
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2158
diff
changeset
|
981 Configuration::InterpretStringParameterAsPath |
|
262fcab24024
fix for HttpsCACertificates
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2158
diff
changeset
|
982 (Configuration::GetGlobalStringParameter("HttpsCACertificates", ""))); |
|
2069
fabf7820d1f1
New configuration options: "DicomScuTimeout" and "DicomScpTimeout" + validation of non-negative options
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2018
diff
changeset
|
983 HttpClient::SetDefaultTimeout(Configuration::GetGlobalUnsignedIntegerParameter("HttpTimeout", 0)); |
|
1987
ce90d109bb64
new plugin functions: OrthancPluginHttpClient and OrthancPluginGenerateUuid
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1982
diff
changeset
|
984 HttpClient::SetDefaultProxy(Configuration::GetGlobalStringParameter("HttpProxy", "")); |
|
2069
fabf7820d1f1
New configuration options: "DicomScuTimeout" and "DicomScpTimeout" + validation of non-negative options
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2018
diff
changeset
|
985 |
|
fabf7820d1f1
New configuration options: "DicomScuTimeout" and "DicomScpTimeout" + validation of non-negative options
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2018
diff
changeset
|
986 DicomUserConnection::SetDefaultTimeout(Configuration::GetGlobalUnsignedIntegerParameter("DicomScuTimeout", 10)); |
|
fabf7820d1f1
New configuration options: "DicomScuTimeout" and "DicomScpTimeout" + validation of non-negative options
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2018
diff
changeset
|
987 |
|
2219
262fcab24024
fix for HttpsCACertificates
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2158
diff
changeset
|
988 ServerContext context(database, storageArea); |
|
1452
b737acb13da5
refactoring of the main function
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1447
diff
changeset
|
989 context.SetCompressionEnabled(Configuration::GetGlobalBoolParameter("StorageCompression", false)); |
|
b737acb13da5
refactoring of the main function
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1447
diff
changeset
|
990 context.SetStoreMD5ForAttachments(Configuration::GetGlobalBoolParameter("StoreMD5ForAttachments", true)); |
|
b737acb13da5
refactoring of the main function
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1447
diff
changeset
|
991 |
|
b737acb13da5
refactoring of the main function
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1447
diff
changeset
|
992 try |
|
b737acb13da5
refactoring of the main function
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1447
diff
changeset
|
993 { |
|
2069
fabf7820d1f1
New configuration options: "DicomScuTimeout" and "DicomScpTimeout" + validation of non-negative options
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2018
diff
changeset
|
994 context.GetIndex().SetMaximumPatientCount(Configuration::GetGlobalUnsignedIntegerParameter("MaximumPatientCount", 0)); |
|
1452
b737acb13da5
refactoring of the main function
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1447
diff
changeset
|
995 } |
|
b737acb13da5
refactoring of the main function
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1447
diff
changeset
|
996 catch (...) |
|
b737acb13da5
refactoring of the main function
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1447
diff
changeset
|
997 { |
|
b737acb13da5
refactoring of the main function
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1447
diff
changeset
|
998 context.GetIndex().SetMaximumPatientCount(0); |
|
b737acb13da5
refactoring of the main function
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1447
diff
changeset
|
999 } |
|
b737acb13da5
refactoring of the main function
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1447
diff
changeset
|
1000 |
|
b737acb13da5
refactoring of the main function
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1447
diff
changeset
|
1001 try |
|
b737acb13da5
refactoring of the main function
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1447
diff
changeset
|
1002 { |
|
2069
fabf7820d1f1
New configuration options: "DicomScuTimeout" and "DicomScpTimeout" + validation of non-negative options
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2018
diff
changeset
|
1003 uint64_t size = Configuration::GetGlobalUnsignedIntegerParameter("MaximumStorageSize", 0); |
|
1452
b737acb13da5
refactoring of the main function
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1447
diff
changeset
|
1004 context.GetIndex().SetMaximumStorageSize(size * 1024 * 1024); |
|
b737acb13da5
refactoring of the main function
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1447
diff
changeset
|
1005 } |
|
b737acb13da5
refactoring of the main function
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1447
diff
changeset
|
1006 catch (...) |
|
b737acb13da5
refactoring of the main function
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1447
diff
changeset
|
1007 { |
|
b737acb13da5
refactoring of the main function
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1447
diff
changeset
|
1008 context.GetIndex().SetMaximumStorageSize(0); |
|
b737acb13da5
refactoring of the main function
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1447
diff
changeset
|
1009 } |
|
b737acb13da5
refactoring of the main function
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1447
diff
changeset
|
1010 |
|
b737acb13da5
refactoring of the main function
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1447
diff
changeset
|
1011 LoadLuaScripts(context); |
|
b737acb13da5
refactoring of the main function
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1447
diff
changeset
|
1012 |
|
2136
dd609a99d39a
uniformization of the macro naming
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2133
diff
changeset
|
1013 #if ORTHANC_ENABLE_PLUGINS == 1 |
|
1452
b737acb13da5
refactoring of the main function
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1447
diff
changeset
|
1014 if (plugins) |
|
b737acb13da5
refactoring of the main function
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1447
diff
changeset
|
1015 { |
|
b737acb13da5
refactoring of the main function
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1447
diff
changeset
|
1016 plugins->SetServerContext(context); |
|
b737acb13da5
refactoring of the main function
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1447
diff
changeset
|
1017 context.SetPlugins(*plugins); |
|
b737acb13da5
refactoring of the main function
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1447
diff
changeset
|
1018 } |
|
1632
eb8fbcf008b5
fix build with plugins disabled
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1630
diff
changeset
|
1019 #endif |
|
1452
b737acb13da5
refactoring of the main function
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1447
diff
changeset
|
1020 |
|
1965
877713b3a91c
fix possibly uninitialized variable
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1962
diff
changeset
|
1021 bool restart = false; |
|
1675
131136aeeaa7
improved exception handling in the main program
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1672
diff
changeset
|
1022 ErrorCode error = ErrorCode_Success; |
|
131136aeeaa7
improved exception handling in the main program
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1672
diff
changeset
|
1023 |
|
131136aeeaa7
improved exception handling in the main program
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1672
diff
changeset
|
1024 try |
|
131136aeeaa7
improved exception handling in the main program
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1672
diff
changeset
|
1025 { |
|
131136aeeaa7
improved exception handling in the main program
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1672
diff
changeset
|
1026 restart = ConfigureHttpHandler(context, plugins); |
|
131136aeeaa7
improved exception handling in the main program
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1672
diff
changeset
|
1027 } |
|
131136aeeaa7
improved exception handling in the main program
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1672
diff
changeset
|
1028 catch (OrthancException& e) |
|
131136aeeaa7
improved exception handling in the main program
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1672
diff
changeset
|
1029 { |
|
131136aeeaa7
improved exception handling in the main program
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1672
diff
changeset
|
1030 error = e.GetErrorCode(); |
|
131136aeeaa7
improved exception handling in the main program
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1672
diff
changeset
|
1031 } |
|
131136aeeaa7
improved exception handling in the main program
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1672
diff
changeset
|
1032 |
|
1452
b737acb13da5
refactoring of the main function
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1447
diff
changeset
|
1033 context.Stop(); |
|
b737acb13da5
refactoring of the main function
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1447
diff
changeset
|
1034 |
|
2136
dd609a99d39a
uniformization of the macro naming
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2133
diff
changeset
|
1035 #if ORTHANC_ENABLE_PLUGINS == 1 |
|
1452
b737acb13da5
refactoring of the main function
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1447
diff
changeset
|
1036 if (plugins) |
|
b737acb13da5
refactoring of the main function
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1447
diff
changeset
|
1037 { |
|
2000
39329372b667
Speedup in plugins by removing unnecessary locks
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1999
diff
changeset
|
1038 plugins->ResetServerContext(); |
|
1452
b737acb13da5
refactoring of the main function
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1447
diff
changeset
|
1039 context.ResetPlugins(); |
|
b737acb13da5
refactoring of the main function
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1447
diff
changeset
|
1040 } |
|
1632
eb8fbcf008b5
fix build with plugins disabled
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1630
diff
changeset
|
1041 #endif |
|
1452
b737acb13da5
refactoring of the main function
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1447
diff
changeset
|
1042 |
|
1675
131136aeeaa7
improved exception handling in the main program
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1672
diff
changeset
|
1043 if (error != ErrorCode_Success) |
|
131136aeeaa7
improved exception handling in the main program
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1672
diff
changeset
|
1044 { |
|
131136aeeaa7
improved exception handling in the main program
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1672
diff
changeset
|
1045 throw OrthancException(error); |
|
131136aeeaa7
improved exception handling in the main program
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1672
diff
changeset
|
1046 } |
|
131136aeeaa7
improved exception handling in the main program
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1672
diff
changeset
|
1047 |
|
1452
b737acb13da5
refactoring of the main function
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1447
diff
changeset
|
1048 return restart; |
|
b737acb13da5
refactoring of the main function
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1447
diff
changeset
|
1049 } |
|
b737acb13da5
refactoring of the main function
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1447
diff
changeset
|
1050 |
|
b737acb13da5
refactoring of the main function
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1447
diff
changeset
|
1051 |
|
1672
4c5a85c3ff43
sample database plugin now working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1669
diff
changeset
|
1052 static bool ConfigureDatabase(IDatabaseWrapper& database, |
|
4c5a85c3ff43
sample database plugin now working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1669
diff
changeset
|
1053 IStorageArea& storageArea, |
|
4c5a85c3ff43
sample database plugin now working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1669
diff
changeset
|
1054 OrthancPlugins *plugins, |
|
2299
03982a0db696
Fix issue #29 (more consistent handling of the "--upgrade" argument)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2295
diff
changeset
|
1055 bool upgradeDatabase) |
|
1672
4c5a85c3ff43
sample database plugin now working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1669
diff
changeset
|
1056 { |
|
4c5a85c3ff43
sample database plugin now working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1669
diff
changeset
|
1057 database.Open(); |
|
2299
03982a0db696
Fix issue #29 (more consistent handling of the "--upgrade" argument)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2295
diff
changeset
|
1058 |
|
03982a0db696
Fix issue #29 (more consistent handling of the "--upgrade" argument)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2295
diff
changeset
|
1059 unsigned int currentVersion = database.GetDatabaseVersion(); |
|
1672
4c5a85c3ff43
sample database plugin now working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1669
diff
changeset
|
1060 |
|
2299
03982a0db696
Fix issue #29 (more consistent handling of the "--upgrade" argument)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2295
diff
changeset
|
1061 if (upgradeDatabase) |
|
1672
4c5a85c3ff43
sample database plugin now working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1669
diff
changeset
|
1062 { |
|
2299
03982a0db696
Fix issue #29 (more consistent handling of the "--upgrade" argument)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2295
diff
changeset
|
1063 UpgradeDatabase(database, storageArea); |
|
03982a0db696
Fix issue #29 (more consistent handling of the "--upgrade" argument)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2295
diff
changeset
|
1064 return false; // Stop and don't restart Orthanc (cf. issue 29) |
|
03982a0db696
Fix issue #29 (more consistent handling of the "--upgrade" argument)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2295
diff
changeset
|
1065 } |
|
03982a0db696
Fix issue #29 (more consistent handling of the "--upgrade" argument)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2295
diff
changeset
|
1066 else if (currentVersion != ORTHANC_DATABASE_VERSION) |
|
03982a0db696
Fix issue #29 (more consistent handling of the "--upgrade" argument)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2295
diff
changeset
|
1067 { |
|
03982a0db696
Fix issue #29 (more consistent handling of the "--upgrade" argument)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2295
diff
changeset
|
1068 LOG(ERROR) << "The database schema must be changed from version " |
|
03982a0db696
Fix issue #29 (more consistent handling of the "--upgrade" argument)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2295
diff
changeset
|
1069 << currentVersion << " to " << ORTHANC_DATABASE_VERSION |
|
03982a0db696
Fix issue #29 (more consistent handling of the "--upgrade" argument)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2295
diff
changeset
|
1070 << ": Please run Orthanc with the \"--upgrade\" argument"; |
|
03982a0db696
Fix issue #29 (more consistent handling of the "--upgrade" argument)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2295
diff
changeset
|
1071 throw OrthancException(ErrorCode_IncompatibleDatabaseVersion); |
|
1672
4c5a85c3ff43
sample database plugin now working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1669
diff
changeset
|
1072 } |
|
4c5a85c3ff43
sample database plugin now working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1669
diff
changeset
|
1073 |
|
4c5a85c3ff43
sample database plugin now working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1669
diff
changeset
|
1074 bool success = ConfigureServerContext(database, storageArea, plugins); |
|
4c5a85c3ff43
sample database plugin now working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1669
diff
changeset
|
1075 |
|
4c5a85c3ff43
sample database plugin now working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1669
diff
changeset
|
1076 database.Close(); |
|
4c5a85c3ff43
sample database plugin now working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1669
diff
changeset
|
1077 |
|
4c5a85c3ff43
sample database plugin now working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1669
diff
changeset
|
1078 return success; |
|
4c5a85c3ff43
sample database plugin now working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1669
diff
changeset
|
1079 } |
|
4c5a85c3ff43
sample database plugin now working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1669
diff
changeset
|
1080 |
|
4c5a85c3ff43
sample database plugin now working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1669
diff
changeset
|
1081 |
|
1452
b737acb13da5
refactoring of the main function
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1447
diff
changeset
|
1082 static bool ConfigurePlugins(int argc, |
|
1615
c40fe92a68e7
Primitives to upgrade the database version in plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1592
diff
changeset
|
1083 char* argv[], |
|
2299
03982a0db696
Fix issue #29 (more consistent handling of the "--upgrade" argument)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2295
diff
changeset
|
1084 bool upgradeDatabase) |
|
1452
b737acb13da5
refactoring of the main function
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1447
diff
changeset
|
1085 { |
|
b737acb13da5
refactoring of the main function
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1447
diff
changeset
|
1086 std::auto_ptr<IDatabaseWrapper> databasePtr; |
|
b737acb13da5
refactoring of the main function
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1447
diff
changeset
|
1087 std::auto_ptr<IStorageArea> storage; |
|
b737acb13da5
refactoring of the main function
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1447
diff
changeset
|
1088 |
|
2136
dd609a99d39a
uniformization of the macro naming
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2133
diff
changeset
|
1089 #if ORTHANC_ENABLE_PLUGINS == 1 |
|
1452
b737acb13da5
refactoring of the main function
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1447
diff
changeset
|
1090 OrthancPlugins plugins; |
|
b737acb13da5
refactoring of the main function
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1447
diff
changeset
|
1091 plugins.SetCommandLineArguments(argc, argv); |
|
b737acb13da5
refactoring of the main function
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1447
diff
changeset
|
1092 LoadPlugins(plugins); |
|
b737acb13da5
refactoring of the main function
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1447
diff
changeset
|
1093 |
|
b737acb13da5
refactoring of the main function
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1447
diff
changeset
|
1094 IDatabaseWrapper* database = NULL; |
|
1630
ffd23c0104af
"/system" URI gives information about the plugins used for storage area and DB back-end
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1615
diff
changeset
|
1095 if (plugins.HasDatabaseBackend()) |
|
1452
b737acb13da5
refactoring of the main function
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1447
diff
changeset
|
1096 { |
|
b737acb13da5
refactoring of the main function
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1447
diff
changeset
|
1097 LOG(WARNING) << "Using a custom database from plugins"; |
|
1630
ffd23c0104af
"/system" URI gives information about the plugins used for storage area and DB back-end
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1615
diff
changeset
|
1098 database = &plugins.GetDatabaseBackend(); |
|
1452
b737acb13da5
refactoring of the main function
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1447
diff
changeset
|
1099 } |
|
b737acb13da5
refactoring of the main function
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1447
diff
changeset
|
1100 else |
|
b737acb13da5
refactoring of the main function
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1447
diff
changeset
|
1101 { |
|
b737acb13da5
refactoring of the main function
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1447
diff
changeset
|
1102 databasePtr.reset(Configuration::CreateDatabaseWrapper()); |
|
b737acb13da5
refactoring of the main function
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1447
diff
changeset
|
1103 database = databasePtr.get(); |
|
b737acb13da5
refactoring of the main function
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1447
diff
changeset
|
1104 } |
|
b737acb13da5
refactoring of the main function
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1447
diff
changeset
|
1105 |
|
b737acb13da5
refactoring of the main function
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1447
diff
changeset
|
1106 if (plugins.HasStorageArea()) |
|
b737acb13da5
refactoring of the main function
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1447
diff
changeset
|
1107 { |
|
b737acb13da5
refactoring of the main function
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1447
diff
changeset
|
1108 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
|
1109 storage.reset(plugins.CreateStorageArea()); |
|
b737acb13da5
refactoring of the main function
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1447
diff
changeset
|
1110 } |
|
b737acb13da5
refactoring of the main function
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1447
diff
changeset
|
1111 else |
|
b737acb13da5
refactoring of the main function
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1447
diff
changeset
|
1112 { |
|
b737acb13da5
refactoring of the main function
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1447
diff
changeset
|
1113 storage.reset(Configuration::CreateStorageArea()); |
|
b737acb13da5
refactoring of the main function
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1447
diff
changeset
|
1114 } |
|
b737acb13da5
refactoring of the main function
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1447
diff
changeset
|
1115 |
|
b737acb13da5
refactoring of the main function
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1447
diff
changeset
|
1116 assert(database != NULL); |
|
b737acb13da5
refactoring of the main function
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1447
diff
changeset
|
1117 assert(storage.get() != NULL); |
|
b737acb13da5
refactoring of the main function
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1447
diff
changeset
|
1118 |
|
2299
03982a0db696
Fix issue #29 (more consistent handling of the "--upgrade" argument)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2295
diff
changeset
|
1119 return ConfigureDatabase(*database, *storage, &plugins, upgradeDatabase); |
|
1452
b737acb13da5
refactoring of the main function
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1447
diff
changeset
|
1120 |
|
2136
dd609a99d39a
uniformization of the macro naming
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2133
diff
changeset
|
1121 #elif ORTHANC_ENABLE_PLUGINS == 0 |
|
1452
b737acb13da5
refactoring of the main function
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1447
diff
changeset
|
1122 // The plugins are disabled |
|
b737acb13da5
refactoring of the main function
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1447
diff
changeset
|
1123 databasePtr.reset(Configuration::CreateDatabaseWrapper()); |
|
b737acb13da5
refactoring of the main function
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1447
diff
changeset
|
1124 storage.reset(Configuration::CreateStorageArea()); |
|
b737acb13da5
refactoring of the main function
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1447
diff
changeset
|
1125 |
|
2299
03982a0db696
Fix issue #29 (more consistent handling of the "--upgrade" argument)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2295
diff
changeset
|
1126 return ConfigureDatabase(*databasePtr, *storage, NULL, upgradeDatabase); |
|
1455
a68545767975
Initialize() and Finalize() events in Lua
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1452
diff
changeset
|
1127 |
|
a68545767975
Initialize() and Finalize() events in Lua
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1452
diff
changeset
|
1128 #else |
|
2136
dd609a99d39a
uniformization of the macro naming
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2133
diff
changeset
|
1129 # error The macro ORTHANC_ENABLE_PLUGINS must be set to 0 or 1 |
|
1452
b737acb13da5
refactoring of the main function
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1447
diff
changeset
|
1130 #endif |
|
b737acb13da5
refactoring of the main function
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1447
diff
changeset
|
1131 } |
|
b737acb13da5
refactoring of the main function
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1447
diff
changeset
|
1132 |
|
b737acb13da5
refactoring of the main function
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1447
diff
changeset
|
1133 |
|
1615
c40fe92a68e7
Primitives to upgrade the database version in plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1592
diff
changeset
|
1134 static bool StartOrthanc(int argc, |
|
c40fe92a68e7
Primitives to upgrade the database version in plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1592
diff
changeset
|
1135 char* argv[], |
|
2299
03982a0db696
Fix issue #29 (more consistent handling of the "--upgrade" argument)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2295
diff
changeset
|
1136 bool upgradeDatabase) |
|
1452
b737acb13da5
refactoring of the main function
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1447
diff
changeset
|
1137 { |
|
2299
03982a0db696
Fix issue #29 (more consistent handling of the "--upgrade" argument)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2295
diff
changeset
|
1138 return ConfigurePlugins(argc, argv, upgradeDatabase); |
|
1452
b737acb13da5
refactoring of the main function
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1447
diff
changeset
|
1139 } |
|
1103
bec1eccf976c
Hot restart of Orthanc
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1102
diff
changeset
|
1140 |
|
893
f57802f8b4dc
plugins for windows
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
831
diff
changeset
|
1141 |
|
2079
acb4cd4af771
Performance warning if runtime debug assertions are turned on
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2069
diff
changeset
|
1142 static bool DisplayPerformanceWarning() |
|
acb4cd4af771
Performance warning if runtime debug assertions are turned on
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2069
diff
changeset
|
1143 { |
|
acb4cd4af771
Performance warning if runtime debug assertions are turned on
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2069
diff
changeset
|
1144 (void) DisplayPerformanceWarning; // Disable warning about unused function |
|
acb4cd4af771
Performance warning if runtime debug assertions are turned on
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2069
diff
changeset
|
1145 LOG(WARNING) << "Performance warning: Non-release build, runtime debug assertions are turned on"; |
|
acb4cd4af771
Performance warning if runtime debug assertions are turned on
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2069
diff
changeset
|
1146 return true; |
|
acb4cd4af771
Performance warning if runtime debug assertions are turned on
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2069
diff
changeset
|
1147 } |
|
acb4cd4af771
Performance warning if runtime debug assertions are turned on
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2069
diff
changeset
|
1148 |
|
acb4cd4af771
Performance warning if runtime debug assertions are turned on
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2069
diff
changeset
|
1149 |
| 0 | 1150 int main(int argc, char* argv[]) |
| 1151 { | |
|
1485
27661b33f624
Creation of Logging.h
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1455
diff
changeset
|
1152 Logging::Initialize(); |
| 133 | 1153 |
|
2299
03982a0db696
Fix issue #29 (more consistent handling of the "--upgrade" argument)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2295
diff
changeset
|
1154 bool upgradeDatabase = false; |
|
1666
d7039be97eeb
better command-line options handling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1651
diff
changeset
|
1155 const char* configurationFile = NULL; |
|
d7039be97eeb
better command-line options handling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1651
diff
changeset
|
1156 |
|
d7039be97eeb
better command-line options handling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1651
diff
changeset
|
1157 |
|
d7039be97eeb
better command-line options handling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1651
diff
changeset
|
1158 /** |
|
d7039be97eeb
better command-line options handling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1651
diff
changeset
|
1159 * Parse the command-line options. |
|
d7039be97eeb
better command-line options handling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1651
diff
changeset
|
1160 **/ |
|
1615
c40fe92a68e7
Primitives to upgrade the database version in plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1592
diff
changeset
|
1161 |
| 112 | 1162 for (int i = 1; i < argc; i++) |
| 1163 { | |
|
1666
d7039be97eeb
better command-line options handling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1651
diff
changeset
|
1164 std::string argument(argv[i]); |
|
d7039be97eeb
better command-line options handling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1651
diff
changeset
|
1165 |
|
d7039be97eeb
better command-line options handling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1651
diff
changeset
|
1166 if (argument.empty()) |
|
d7039be97eeb
better command-line options handling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1651
diff
changeset
|
1167 { |
|
d7039be97eeb
better command-line options handling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1651
diff
changeset
|
1168 // Ignore empty arguments |
|
d7039be97eeb
better command-line options handling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1651
diff
changeset
|
1169 } |
|
d7039be97eeb
better command-line options handling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1651
diff
changeset
|
1170 else if (argument[0] != '-') |
|
d7039be97eeb
better command-line options handling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1651
diff
changeset
|
1171 { |
|
d7039be97eeb
better command-line options handling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1651
diff
changeset
|
1172 if (configurationFile != NULL) |
|
d7039be97eeb
better command-line options handling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1651
diff
changeset
|
1173 { |
|
d7039be97eeb
better command-line options handling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1651
diff
changeset
|
1174 LOG(ERROR) << "More than one configuration path were provided on the command line, aborting"; |
|
d7039be97eeb
better command-line options handling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1651
diff
changeset
|
1175 return -1; |
|
d7039be97eeb
better command-line options handling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1651
diff
changeset
|
1176 } |
|
d7039be97eeb
better command-line options handling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1651
diff
changeset
|
1177 else |
|
d7039be97eeb
better command-line options handling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1651
diff
changeset
|
1178 { |
|
d7039be97eeb
better command-line options handling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1651
diff
changeset
|
1179 // Use the first argument that does not start with a "-" as |
|
d7039be97eeb
better command-line options handling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1651
diff
changeset
|
1180 // the configuration file |
|
2018
300599489cab
USE_BOOST_LOCALE_BACKENDS
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2015
diff
changeset
|
1181 |
|
300599489cab
USE_BOOST_LOCALE_BACKENDS
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2015
diff
changeset
|
1182 // TODO WHAT IS THE ENCODING? |
|
1666
d7039be97eeb
better command-line options handling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1651
diff
changeset
|
1183 configurationFile = argv[i]; |
|
d7039be97eeb
better command-line options handling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1651
diff
changeset
|
1184 } |
|
d7039be97eeb
better command-line options handling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1651
diff
changeset
|
1185 } |
| 1733 | 1186 else if (argument == "--errors") |
| 1187 { | |
| 1188 PrintErrors(argv[0]); | |
| 1189 return 0; | |
| 1190 } | |
|
1666
d7039be97eeb
better command-line options handling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1651
diff
changeset
|
1191 else if (argument == "--help") |
| 133 | 1192 { |
| 1193 PrintHelp(argv[0]); | |
| 1194 return 0; | |
| 1195 } | |
|
1666
d7039be97eeb
better command-line options handling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1651
diff
changeset
|
1196 else if (argument == "--version") |
| 133 | 1197 { |
| 1198 PrintVersion(argv[0]); | |
| 1199 return 0; | |
| 1200 } | |
|
1666
d7039be97eeb
better command-line options handling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1651
diff
changeset
|
1201 else if (argument == "--verbose") |
|
137
0e97abc7b950
fix of a bug in older versions of sqlite
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
136
diff
changeset
|
1202 { |
|
1485
27661b33f624
Creation of Logging.h
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1455
diff
changeset
|
1203 Logging::EnableInfoLevel(true); |
|
137
0e97abc7b950
fix of a bug in older versions of sqlite
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
136
diff
changeset
|
1204 } |
|
1666
d7039be97eeb
better command-line options handling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1651
diff
changeset
|
1205 else if (argument == "--trace") |
|
137
0e97abc7b950
fix of a bug in older versions of sqlite
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
136
diff
changeset
|
1206 { |
|
1485
27661b33f624
Creation of Logging.h
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1455
diff
changeset
|
1207 Logging::EnableTraceLevel(true); |
|
137
0e97abc7b950
fix of a bug in older versions of sqlite
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
136
diff
changeset
|
1208 } |
|
1666
d7039be97eeb
better command-line options handling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1651
diff
changeset
|
1209 else if (boost::starts_with(argument, "--logdir=")) |
| 112 | 1210 { |
|
2018
300599489cab
USE_BOOST_LOCALE_BACKENDS
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2015
diff
changeset
|
1211 // TODO WHAT IS THE ENCODING? |
|
1666
d7039be97eeb
better command-line options handling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1651
diff
changeset
|
1212 std::string directory = argument.substr(9); |
|
1490
596927722403
support of --logdir by the internal logger
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1489
diff
changeset
|
1213 |
|
596927722403
support of --logdir by the internal logger
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1489
diff
changeset
|
1214 try |
|
596927722403
support of --logdir by the internal logger
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1489
diff
changeset
|
1215 { |
|
596927722403
support of --logdir by the internal logger
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1489
diff
changeset
|
1216 Logging::SetTargetFolder(directory); |
|
596927722403
support of --logdir by the internal logger
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1489
diff
changeset
|
1217 } |
|
596927722403
support of --logdir by the internal logger
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1489
diff
changeset
|
1218 catch (OrthancException&) |
|
596927722403
support of --logdir by the internal logger
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1489
diff
changeset
|
1219 { |
|
1666
d7039be97eeb
better command-line options handling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1651
diff
changeset
|
1220 LOG(ERROR) << "The directory where to store the log files (" |
|
d7039be97eeb
better command-line options handling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1651
diff
changeset
|
1221 << directory << ") is inexistent, aborting."; |
|
1490
596927722403
support of --logdir by the internal logger
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1489
diff
changeset
|
1222 return -1; |
|
596927722403
support of --logdir by the internal logger
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1489
diff
changeset
|
1223 } |
| 112 | 1224 } |
|
2015
bcc575732aef
New option "--logfile" to output the Orthanc log to the given file
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2010
diff
changeset
|
1225 else if (boost::starts_with(argument, "--logfile=")) |
|
bcc575732aef
New option "--logfile" to output the Orthanc log to the given file
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2010
diff
changeset
|
1226 { |
|
2018
300599489cab
USE_BOOST_LOCALE_BACKENDS
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2015
diff
changeset
|
1227 // TODO WHAT IS THE ENCODING? |
|
2015
bcc575732aef
New option "--logfile" to output the Orthanc log to the given file
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2010
diff
changeset
|
1228 std::string file = argument.substr(10); |
|
bcc575732aef
New option "--logfile" to output the Orthanc log to the given file
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2010
diff
changeset
|
1229 |
|
bcc575732aef
New option "--logfile" to output the Orthanc log to the given file
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2010
diff
changeset
|
1230 try |
|
bcc575732aef
New option "--logfile" to output the Orthanc log to the given file
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2010
diff
changeset
|
1231 { |
|
bcc575732aef
New option "--logfile" to output the Orthanc log to the given file
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2010
diff
changeset
|
1232 Logging::SetTargetFile(file); |
|
bcc575732aef
New option "--logfile" to output the Orthanc log to the given file
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2010
diff
changeset
|
1233 } |
|
bcc575732aef
New option "--logfile" to output the Orthanc log to the given file
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2010
diff
changeset
|
1234 catch (OrthancException&) |
|
bcc575732aef
New option "--logfile" to output the Orthanc log to the given file
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2010
diff
changeset
|
1235 { |
|
bcc575732aef
New option "--logfile" to output the Orthanc log to the given file
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2010
diff
changeset
|
1236 LOG(ERROR) << "Cannot write to the specified log file (" |
|
bcc575732aef
New option "--logfile" to output the Orthanc log to the given file
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2010
diff
changeset
|
1237 << file << "), aborting."; |
|
bcc575732aef
New option "--logfile" to output the Orthanc log to the given file
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2010
diff
changeset
|
1238 return -1; |
|
bcc575732aef
New option "--logfile" to output the Orthanc log to the given file
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2010
diff
changeset
|
1239 } |
|
bcc575732aef
New option "--logfile" to output the Orthanc log to the given file
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2010
diff
changeset
|
1240 } |
|
1666
d7039be97eeb
better command-line options handling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1651
diff
changeset
|
1241 else if (argument == "--upgrade") |
|
1615
c40fe92a68e7
Primitives to upgrade the database version in plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1592
diff
changeset
|
1242 { |
|
2299
03982a0db696
Fix issue #29 (more consistent handling of the "--upgrade" argument)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2295
diff
changeset
|
1243 upgradeDatabase = true; |
|
1615
c40fe92a68e7
Primitives to upgrade the database version in plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1592
diff
changeset
|
1244 } |
|
1666
d7039be97eeb
better command-line options handling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1651
diff
changeset
|
1245 else if (boost::starts_with(argument, "--config=")) |
|
175
662af781a227
sample config file from command line
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
158
diff
changeset
|
1246 { |
|
2018
300599489cab
USE_BOOST_LOCALE_BACKENDS
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2015
diff
changeset
|
1247 // TODO WHAT IS THE ENCODING? |
|
175
662af781a227
sample config file from command line
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
158
diff
changeset
|
1248 std::string configurationSample; |
|
662af781a227
sample config file from command line
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
158
diff
changeset
|
1249 GetFileResource(configurationSample, EmbeddedResources::CONFIGURATION_SAMPLE); |
|
662af781a227
sample config file from command line
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
158
diff
changeset
|
1250 |
| 684 | 1251 #if defined(_WIN32) |
| 1252 // Replace UNIX newlines with DOS newlines | |
| 1253 boost::replace_all(configurationSample, "\n", "\r\n"); | |
| 1254 #endif | |
| 1255 | |
|
1666
d7039be97eeb
better command-line options handling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1651
diff
changeset
|
1256 std::string target = argument.substr(9); |
|
2295
5465cab476cf
Fix issue #45 (crash when providing a folder to "--config" command-line option)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2268
diff
changeset
|
1257 |
|
5465cab476cf
Fix issue #45 (crash when providing a folder to "--config" command-line option)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2268
diff
changeset
|
1258 try |
|
5465cab476cf
Fix issue #45 (crash when providing a folder to "--config" command-line option)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2268
diff
changeset
|
1259 { |
|
5465cab476cf
Fix issue #45 (crash when providing a folder to "--config" command-line option)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2268
diff
changeset
|
1260 SystemToolbox::WriteFile(configurationSample, target); |
|
5465cab476cf
Fix issue #45 (crash when providing a folder to "--config" command-line option)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2268
diff
changeset
|
1261 return 0; |
|
5465cab476cf
Fix issue #45 (crash when providing a folder to "--config" command-line option)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2268
diff
changeset
|
1262 } |
|
5465cab476cf
Fix issue #45 (crash when providing a folder to "--config" command-line option)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2268
diff
changeset
|
1263 catch (OrthancException&) |
|
5465cab476cf
Fix issue #45 (crash when providing a folder to "--config" command-line option)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2268
diff
changeset
|
1264 { |
|
5465cab476cf
Fix issue #45 (crash when providing a folder to "--config" command-line option)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2268
diff
changeset
|
1265 LOG(ERROR) << "Cannot write sample configuration as file \"" << target << "\""; |
|
5465cab476cf
Fix issue #45 (crash when providing a folder to "--config" command-line option)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2268
diff
changeset
|
1266 return -1; |
|
5465cab476cf
Fix issue #45 (crash when providing a folder to "--config" command-line option)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2268
diff
changeset
|
1267 } |
|
175
662af781a227
sample config file from command line
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
158
diff
changeset
|
1268 } |
|
1666
d7039be97eeb
better command-line options handling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1651
diff
changeset
|
1269 else |
|
d7039be97eeb
better command-line options handling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1651
diff
changeset
|
1270 { |
|
d7039be97eeb
better command-line options handling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1651
diff
changeset
|
1271 LOG(WARNING) << "Option unsupported by the core of Orthanc: " << argument; |
|
d7039be97eeb
better command-line options handling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1651
diff
changeset
|
1272 } |
| 112 | 1273 } |
| 1274 | |
|
1666
d7039be97eeb
better command-line options handling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1651
diff
changeset
|
1275 |
|
d7039be97eeb
better command-line options handling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1651
diff
changeset
|
1276 /** |
|
d7039be97eeb
better command-line options handling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1651
diff
changeset
|
1277 * Launch Orthanc. |
|
d7039be97eeb
better command-line options handling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1651
diff
changeset
|
1278 **/ |
|
1102
ce6386b37afd
avoid unnecessary exceptions on Orthanc startup
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1066
diff
changeset
|
1279 |
|
1866
579bf74f7da1
output creation time for mainline builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1851
diff
changeset
|
1280 { |
|
579bf74f7da1
output creation time for mainline builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1851
diff
changeset
|
1281 std::string version(ORTHANC_VERSION); |
|
579bf74f7da1
output creation time for mainline builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1851
diff
changeset
|
1282 |
|
579bf74f7da1
output creation time for mainline builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1851
diff
changeset
|
1283 if (std::string(ORTHANC_VERSION) == "mainline") |
|
579bf74f7da1
output creation time for mainline builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1851
diff
changeset
|
1284 { |
|
579bf74f7da1
output creation time for mainline builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1851
diff
changeset
|
1285 try |
|
579bf74f7da1
output creation time for mainline builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1851
diff
changeset
|
1286 { |
| 2140 | 1287 boost::filesystem::path exe(SystemToolbox::GetPathToExecutable()); |
|
1866
579bf74f7da1
output creation time for mainline builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1851
diff
changeset
|
1288 std::time_t creation = boost::filesystem::last_write_time(exe); |
|
579bf74f7da1
output creation time for mainline builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1851
diff
changeset
|
1289 boost::posix_time::ptime converted(boost::posix_time::from_time_t(creation)); |
|
579bf74f7da1
output creation time for mainline builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1851
diff
changeset
|
1290 version += " (" + boost::posix_time::to_iso_string(converted) + ")"; |
|
579bf74f7da1
output creation time for mainline builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1851
diff
changeset
|
1291 } |
|
579bf74f7da1
output creation time for mainline builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1851
diff
changeset
|
1292 catch (...) |
|
579bf74f7da1
output creation time for mainline builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1851
diff
changeset
|
1293 { |
|
579bf74f7da1
output creation time for mainline builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1851
diff
changeset
|
1294 } |
|
579bf74f7da1
output creation time for mainline builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1851
diff
changeset
|
1295 } |
|
579bf74f7da1
output creation time for mainline builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1851
diff
changeset
|
1296 |
|
579bf74f7da1
output creation time for mainline builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1851
diff
changeset
|
1297 LOG(WARNING) << "Orthanc version: " << version; |
|
2079
acb4cd4af771
Performance warning if runtime debug assertions are turned on
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2069
diff
changeset
|
1298 assert(DisplayPerformanceWarning()); |
|
1866
579bf74f7da1
output creation time for mainline builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1851
diff
changeset
|
1299 } |
|
1102
ce6386b37afd
avoid unnecessary exceptions on Orthanc startup
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1066
diff
changeset
|
1300 |
|
291
4d7469f72a0b
embedding of dicom dictionaries
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
270
diff
changeset
|
1301 int status = 0; |
| 0 | 1302 try |
| 1303 { | |
|
1103
bec1eccf976c
Hot restart of Orthanc
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1102
diff
changeset
|
1304 for (;;) |
|
270
e6a4c4329481
parameters for storage capacity
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
236
diff
changeset
|
1305 { |
|
1103
bec1eccf976c
Hot restart of Orthanc
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1102
diff
changeset
|
1306 OrthancInitialize(configurationFile); |
| 0 | 1307 |
|
2299
03982a0db696
Fix issue #29 (more consistent handling of the "--upgrade" argument)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2295
diff
changeset
|
1308 bool restart = StartOrthanc(argc, argv, upgradeDatabase); |
|
1452
b737acb13da5
refactoring of the main function
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1447
diff
changeset
|
1309 if (restart) |
| 23 | 1310 { |
|
1103
bec1eccf976c
Hot restart of Orthanc
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1102
diff
changeset
|
1311 OrthancFinalize(); |
|
2015
bcc575732aef
New option "--logfile" to output the Orthanc log to the given file
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2010
diff
changeset
|
1312 LOG(WARNING) << "Logging system is resetting"; |
|
bcc575732aef
New option "--logfile" to output the Orthanc log to the given file
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2010
diff
changeset
|
1313 Logging::Reset(); |
| 23 | 1314 } |
| 1315 else | |
| 1316 { | |
|
1103
bec1eccf976c
Hot restart of Orthanc
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1102
diff
changeset
|
1317 break; |
| 23 | 1318 } |
| 0 | 1319 } |
| 1320 } | |
|
1245
aea9277dee75
catch more exceptions (patch from Valdas Rapsevicius)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1232
diff
changeset
|
1321 catch (const OrthancException& e) |
| 0 | 1322 { |
| 1733 | 1323 LOG(ERROR) << "Uncaught exception, stopping now: [" << e.What() << "] (code " << e.GetErrorCode() << ")"; |
| 1324 #if defined(_WIN32) | |
|
1734
e2675b37eb01
Under Windows, the exit status of Orthanc corresponds to the encountered error code
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1733
diff
changeset
|
1325 if (e.GetErrorCode() >= ErrorCode_START_PLUGINS) |
|
e2675b37eb01
Under Windows, the exit status of Orthanc corresponds to the encountered error code
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1733
diff
changeset
|
1326 { |
|
e2675b37eb01
Under Windows, the exit status of Orthanc corresponds to the encountered error code
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1733
diff
changeset
|
1327 status = static_cast<int>(ErrorCode_Plugin); |
|
e2675b37eb01
Under Windows, the exit status of Orthanc corresponds to the encountered error code
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1733
diff
changeset
|
1328 } |
|
e2675b37eb01
Under Windows, the exit status of Orthanc corresponds to the encountered error code
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1733
diff
changeset
|
1329 else |
|
e2675b37eb01
Under Windows, the exit status of Orthanc corresponds to the encountered error code
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1733
diff
changeset
|
1330 { |
|
e2675b37eb01
Under Windows, the exit status of Orthanc corresponds to the encountered error code
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1733
diff
changeset
|
1331 status = static_cast<int>(e.GetErrorCode()); |
|
e2675b37eb01
Under Windows, the exit status of Orthanc corresponds to the encountered error code
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1733
diff
changeset
|
1332 } |
|
e2675b37eb01
Under Windows, the exit status of Orthanc corresponds to the encountered error code
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1733
diff
changeset
|
1333 |
| 1733 | 1334 #else |
|
291
4d7469f72a0b
embedding of dicom dictionaries
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
270
diff
changeset
|
1335 status = -1; |
| 1733 | 1336 #endif |
|
291
4d7469f72a0b
embedding of dicom dictionaries
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
270
diff
changeset
|
1337 } |
|
1245
aea9277dee75
catch more exceptions (patch from Valdas Rapsevicius)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1232
diff
changeset
|
1338 catch (const std::exception& e) |
|
aea9277dee75
catch more exceptions (patch from Valdas Rapsevicius)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1232
diff
changeset
|
1339 { |
|
aea9277dee75
catch more exceptions (patch from Valdas Rapsevicius)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1232
diff
changeset
|
1340 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
|
1341 status = -1; |
|
aea9277dee75
catch more exceptions (patch from Valdas Rapsevicius)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1232
diff
changeset
|
1342 } |
|
aea9277dee75
catch more exceptions (patch from Valdas Rapsevicius)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1232
diff
changeset
|
1343 catch (const std::string& s) |
|
aea9277dee75
catch more exceptions (patch from Valdas Rapsevicius)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1232
diff
changeset
|
1344 { |
|
aea9277dee75
catch more exceptions (patch from Valdas Rapsevicius)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1232
diff
changeset
|
1345 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
|
1346 status = -1; |
|
aea9277dee75
catch more exceptions (patch from Valdas Rapsevicius)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1232
diff
changeset
|
1347 } |
|
291
4d7469f72a0b
embedding of dicom dictionaries
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
270
diff
changeset
|
1348 catch (...) |
|
4d7469f72a0b
embedding of dicom dictionaries
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
270
diff
changeset
|
1349 { |
|
1223
5bd4c9f85b4c
fix race condition while unregistering plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1210
diff
changeset
|
1350 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
|
1351 status = -1; |
| 0 | 1352 } |
| 1353 | |
| 62 | 1354 OrthancFinalize(); |
| 27 | 1355 |
|
690
2e67366aab83
case-insensitive matching of Application Entity Titles
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
689
diff
changeset
|
1356 LOG(WARNING) << "Orthanc has stopped"; |
|
2e67366aab83
case-insensitive matching of Application Entity Titles
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
689
diff
changeset
|
1357 |
|
1485
27661b33f624
Creation of Logging.h
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1455
diff
changeset
|
1358 Logging::Finalize(); |
|
27661b33f624
Creation of Logging.h
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1455
diff
changeset
|
1359 |
|
291
4d7469f72a0b
embedding of dicom dictionaries
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
270
diff
changeset
|
1360 return status; |
| 0 | 1361 } |