Mercurial > hg > orthanc
annotate OrthancServer/Sources/ServerJobs/Operations/SystemCallOperation.cpp @ 4286:526bd8bad850
debug logs for C-MOVE and C-GET SCP
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Wed, 04 Nov 2020 17:40:25 +0100 |
parents | 05b8fd21089c |
children | 2ae905070221 |
rev | line source |
---|---|
2606 | 1 /** |
2 * Orthanc - A Lightweight, RESTful DICOM Store | |
3 * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics | |
4 * Department, University Hospital of Liege, Belgium | |
3640
94f4a18a79cc
upgrade to year 2020
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3181
diff
changeset
|
5 * Copyright (C) 2017-2020 Osimis S.A., Belgium |
2606 | 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. | |
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. | |
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 | |
2641 | 34 #include "../../PrecompiledHeadersServer.h" |
2606 | 35 #include "SystemCallOperation.h" |
36 | |
37 #include "DicomInstanceOperationValue.h" | |
38 | |
4045 | 39 #include "../../../../OrthancFramework/Sources/JobsEngine/Operations/StringOperationValue.h" |
40 #include "../../../../OrthancFramework/Sources/Logging.h" | |
41 #include "../../../../OrthancFramework/Sources/OrthancException.h" | |
42 #include "../../../../OrthancFramework/Sources/SerializationToolbox.h" | |
43 #include "../../../../OrthancFramework/Sources/TemporaryFile.h" | |
44 #include "../../../../OrthancFramework/Sources/Toolbox.h" | |
45 #include "../../../../OrthancFramework/Sources/SystemToolbox.h" | |
3181
6fd38327e777
Fix issue #130 (Orthanc failed to start when /tmp partition was full)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3095
diff
changeset
|
46 #include "../../OrthancConfiguration.h" |
2606 | 47 |
48 namespace Orthanc | |
49 { | |
2659 | 50 const std::string& SystemCallOperation::GetPreArgument(size_t i) const |
51 { | |
52 if (i >= preArguments_.size()) | |
53 { | |
54 throw OrthancException(ErrorCode_ParameterOutOfRange); | |
55 } | |
56 else | |
57 { | |
58 return preArguments_[i]; | |
59 } | |
60 } | |
61 | |
62 | |
63 const std::string& SystemCallOperation::GetPostArgument(size_t i) const | |
64 { | |
65 if (i >= postArguments_.size()) | |
66 { | |
67 throw OrthancException(ErrorCode_ParameterOutOfRange); | |
68 } | |
69 else | |
70 { | |
71 return postArguments_[i]; | |
72 } | |
73 } | |
74 | |
75 | |
2606 | 76 void SystemCallOperation::Apply(JobOperationValues& outputs, |
3851
6498739a3c3c
refactoring: TimeoutDicomConnectionManager is now only used by Lua
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3850
diff
changeset
|
77 const JobOperationValue& input) |
2606 | 78 { |
79 std::vector<std::string> arguments = preArguments_; | |
80 | |
81 arguments.reserve(arguments.size() + postArguments_.size() + 1); | |
82 | |
3712
2a170a8f1faf
replacing std::auto_ptr by std::unique_ptr
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3640
diff
changeset
|
83 std::unique_ptr<TemporaryFile> tmp; |
2606 | 84 |
85 switch (input.GetType()) | |
86 { | |
87 case JobOperationValue::Type_DicomInstance: | |
88 { | |
89 const DicomInstanceOperationValue& instance = | |
90 dynamic_cast<const DicomInstanceOperationValue&>(input); | |
91 | |
92 std::string dicom; | |
2651
1da5a052c777
testing value serialization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2641
diff
changeset
|
93 instance.ReadDicom(dicom); |
2606 | 94 |
3181
6fd38327e777
Fix issue #130 (Orthanc failed to start when /tmp partition was full)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3095
diff
changeset
|
95 { |
6fd38327e777
Fix issue #130 (Orthanc failed to start when /tmp partition was full)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3095
diff
changeset
|
96 OrthancConfiguration::ReaderLock lock; |
6fd38327e777
Fix issue #130 (Orthanc failed to start when /tmp partition was full)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3095
diff
changeset
|
97 tmp.reset(lock.GetConfiguration().CreateTemporaryFile()); |
6fd38327e777
Fix issue #130 (Orthanc failed to start when /tmp partition was full)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3095
diff
changeset
|
98 } |
6fd38327e777
Fix issue #130 (Orthanc failed to start when /tmp partition was full)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3095
diff
changeset
|
99 |
2606 | 100 tmp->Write(dicom); |
101 | |
102 arguments.push_back(tmp->GetPath()); | |
103 break; | |
104 } | |
105 | |
106 case JobOperationValue::Type_String: | |
107 { | |
108 const StringOperationValue& value = | |
109 dynamic_cast<const StringOperationValue&>(input); | |
110 | |
111 arguments.push_back(value.GetContent()); | |
112 break; | |
113 } | |
114 | |
115 case JobOperationValue::Type_Null: | |
116 break; | |
117 | |
118 default: | |
119 throw OrthancException(ErrorCode_BadParameterType); | |
120 } | |
121 | |
122 for (size_t i = 0; i < postArguments_.size(); i++) | |
123 { | |
124 arguments.push_back(postArguments_[i]); | |
125 } | |
126 | |
127 std::string info = command_; | |
128 for (size_t i = 0; i < arguments.size(); i++) | |
129 { | |
130 info += " " + arguments[i]; | |
131 } | |
132 | |
2607
44e268605478
ModifyInstanceOperation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2606
diff
changeset
|
133 LOG(INFO) << "Lua: System call: \"" << info << "\""; |
2606 | 134 |
135 try | |
136 { | |
137 SystemToolbox::ExecuteSystemCommand(command_, arguments); | |
138 | |
139 // Only chain with other commands if this operation succeeds | |
140 outputs.Append(input.Clone()); | |
141 } | |
142 catch (OrthancException& e) | |
143 { | |
2607
44e268605478
ModifyInstanceOperation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2606
diff
changeset
|
144 LOG(ERROR) << "Lua: Failed system call - \"" << info << "\": " << e.What(); |
2606 | 145 } |
146 } | |
2616
2f3007bf0708
event queues in Lua, serialization of sequence of operations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2608
diff
changeset
|
147 |
2f3007bf0708
event queues in Lua, serialization of sequence of operations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2608
diff
changeset
|
148 |
2f3007bf0708
event queues in Lua, serialization of sequence of operations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2608
diff
changeset
|
149 void SystemCallOperation::Serialize(Json::Value& result) const |
2f3007bf0708
event queues in Lua, serialization of sequence of operations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2608
diff
changeset
|
150 { |
2654 | 151 result = Json::objectValue; |
2616
2f3007bf0708
event queues in Lua, serialization of sequence of operations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2608
diff
changeset
|
152 result["Type"] = "SystemCall"; |
2f3007bf0708
event queues in Lua, serialization of sequence of operations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2608
diff
changeset
|
153 result["Command"] = command_; |
2656
a6d3e45eeff5
SerializationToolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2655
diff
changeset
|
154 SerializationToolbox::WriteArrayOfStrings(result, preArguments_, "PreArguments"); |
a6d3e45eeff5
SerializationToolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2655
diff
changeset
|
155 SerializationToolbox::WriteArrayOfStrings(result, postArguments_, "PostArguments"); |
2655 | 156 } |
2616
2f3007bf0708
event queues in Lua, serialization of sequence of operations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2608
diff
changeset
|
157 |
2f3007bf0708
event queues in Lua, serialization of sequence of operations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2608
diff
changeset
|
158 |
2655 | 159 SystemCallOperation::SystemCallOperation(const Json::Value& serialized) |
160 { | |
2656
a6d3e45eeff5
SerializationToolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2655
diff
changeset
|
161 if (SerializationToolbox::ReadString(serialized, "Type") != "SystemCall") |
2616
2f3007bf0708
event queues in Lua, serialization of sequence of operations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2608
diff
changeset
|
162 { |
2655 | 163 throw OrthancException(ErrorCode_BadFileFormat); |
2616
2f3007bf0708
event queues in Lua, serialization of sequence of operations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2608
diff
changeset
|
164 } |
2f3007bf0708
event queues in Lua, serialization of sequence of operations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2608
diff
changeset
|
165 |
2656
a6d3e45eeff5
SerializationToolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2655
diff
changeset
|
166 command_ = SerializationToolbox::ReadString(serialized, "Command"); |
a6d3e45eeff5
SerializationToolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2655
diff
changeset
|
167 SerializationToolbox::ReadArrayOfStrings(preArguments_, serialized, "PreArguments"); |
a6d3e45eeff5
SerializationToolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2655
diff
changeset
|
168 SerializationToolbox::ReadArrayOfStrings(postArguments_, serialized, "PostArguments"); |
2616
2f3007bf0708
event queues in Lua, serialization of sequence of operations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2608
diff
changeset
|
169 } |
2606 | 170 } |