Mercurial > hg > orthanc
annotate OrthancServer/Sources/ServerJobs/Operations/SystemCallOperation.cpp @ 5117:849000df79b6
fix missing handling of StoreStatus_StorageFull
| author | Sebastien Jodogne <s.jodogne@gmail.com> |
|---|---|
| date | Fri, 02 Dec 2022 15:32:53 +0100 |
| parents | 6eff25f70121 |
| children | 0ea402b4d901 |
| 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 | |
|
4870
43e613a7756b
upgrade to year 2022
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4831
diff
changeset
|
5 * Copyright (C) 2017-2022 Osimis S.A., Belgium |
|
43e613a7756b
upgrade to year 2022
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4831
diff
changeset
|
6 * Copyright (C) 2021-2022 Sebastien Jodogne, ICTEAM UCLouvain, Belgium |
| 2606 | 7 * |
| 8 * This program is free software: you can redistribute it and/or | |
| 9 * modify it under the terms of the GNU General Public License as | |
| 10 * published by the Free Software Foundation, either version 3 of the | |
| 11 * License, or (at your option) any later version. | |
| 12 * | |
| 13 * This program is distributed in the hope that it will be useful, but | |
| 14 * WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
| 16 * General Public License for more details. | |
| 17 * | |
| 18 * You should have received a copy of the GNU General Public License | |
| 19 * along with this program. If not, see <http://www.gnu.org/licenses/>. | |
| 20 **/ | |
| 21 | |
| 22 | |
| 2641 | 23 #include "../../PrecompiledHeadersServer.h" |
| 2606 | 24 #include "SystemCallOperation.h" |
| 25 | |
| 26 #include "DicomInstanceOperationValue.h" | |
| 27 | |
| 4045 | 28 #include "../../../../OrthancFramework/Sources/JobsEngine/Operations/StringOperationValue.h" |
| 29 #include "../../../../OrthancFramework/Sources/Logging.h" | |
| 30 #include "../../../../OrthancFramework/Sources/OrthancException.h" | |
| 31 #include "../../../../OrthancFramework/Sources/SerializationToolbox.h" | |
| 32 #include "../../../../OrthancFramework/Sources/TemporaryFile.h" | |
| 33 #include "../../../../OrthancFramework/Sources/Toolbox.h" | |
| 34 #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
|
35 #include "../../OrthancConfiguration.h" |
| 2606 | 36 |
| 37 namespace Orthanc | |
| 38 { | |
| 2659 | 39 const std::string& SystemCallOperation::GetPreArgument(size_t i) const |
| 40 { | |
| 41 if (i >= preArguments_.size()) | |
| 42 { | |
| 43 throw OrthancException(ErrorCode_ParameterOutOfRange); | |
| 44 } | |
| 45 else | |
| 46 { | |
| 47 return preArguments_[i]; | |
| 48 } | |
| 49 } | |
| 50 | |
| 51 | |
| 52 const std::string& SystemCallOperation::GetPostArgument(size_t i) const | |
| 53 { | |
| 54 if (i >= postArguments_.size()) | |
| 55 { | |
| 56 throw OrthancException(ErrorCode_ParameterOutOfRange); | |
| 57 } | |
| 58 else | |
| 59 { | |
| 60 return postArguments_[i]; | |
| 61 } | |
| 62 } | |
| 63 | |
| 64 | |
| 2606 | 65 void SystemCallOperation::Apply(JobOperationValues& outputs, |
|
4310
2ae905070221
renaming pure interface JobOperationValue as IJobOperationValue
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4045
diff
changeset
|
66 const IJobOperationValue& input) |
| 2606 | 67 { |
| 68 std::vector<std::string> arguments = preArguments_; | |
| 69 | |
| 70 arguments.reserve(arguments.size() + postArguments_.size() + 1); | |
| 71 | |
|
3712
2a170a8f1faf
replacing std::auto_ptr by std::unique_ptr
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3640
diff
changeset
|
72 std::unique_ptr<TemporaryFile> tmp; |
| 2606 | 73 |
| 74 switch (input.GetType()) | |
| 75 { | |
|
4310
2ae905070221
renaming pure interface JobOperationValue as IJobOperationValue
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4045
diff
changeset
|
76 case IJobOperationValue::Type_DicomInstance: |
| 2606 | 77 { |
| 78 const DicomInstanceOperationValue& instance = | |
| 79 dynamic_cast<const DicomInstanceOperationValue&>(input); | |
| 80 | |
| 81 std::string dicom; | |
|
2651
1da5a052c777
testing value serialization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2641
diff
changeset
|
82 instance.ReadDicom(dicom); |
| 2606 | 83 |
|
3181
6fd38327e777
Fix issue #130 (Orthanc failed to start when /tmp partition was full)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3095
diff
changeset
|
84 { |
|
6fd38327e777
Fix issue #130 (Orthanc failed to start when /tmp partition was full)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3095
diff
changeset
|
85 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
|
86 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
|
87 } |
|
6fd38327e777
Fix issue #130 (Orthanc failed to start when /tmp partition was full)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3095
diff
changeset
|
88 |
| 2606 | 89 tmp->Write(dicom); |
| 90 | |
| 91 arguments.push_back(tmp->GetPath()); | |
| 92 break; | |
| 93 } | |
| 94 | |
|
4310
2ae905070221
renaming pure interface JobOperationValue as IJobOperationValue
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4045
diff
changeset
|
95 case IJobOperationValue::Type_String: |
| 2606 | 96 { |
| 97 const StringOperationValue& value = | |
| 98 dynamic_cast<const StringOperationValue&>(input); | |
| 99 | |
| 100 arguments.push_back(value.GetContent()); | |
| 101 break; | |
| 102 } | |
| 103 | |
|
4310
2ae905070221
renaming pure interface JobOperationValue as IJobOperationValue
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4045
diff
changeset
|
104 case IJobOperationValue::Type_Null: |
| 2606 | 105 break; |
| 106 | |
| 107 default: | |
| 108 throw OrthancException(ErrorCode_BadParameterType); | |
| 109 } | |
| 110 | |
| 111 for (size_t i = 0; i < postArguments_.size(); i++) | |
| 112 { | |
| 113 arguments.push_back(postArguments_[i]); | |
| 114 } | |
| 115 | |
| 116 std::string info = command_; | |
| 117 for (size_t i = 0; i < arguments.size(); i++) | |
| 118 { | |
| 119 info += " " + arguments[i]; | |
| 120 } | |
| 121 | |
|
2607
44e268605478
ModifyInstanceOperation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2606
diff
changeset
|
122 LOG(INFO) << "Lua: System call: \"" << info << "\""; |
| 2606 | 123 |
| 124 try | |
| 125 { | |
| 126 SystemToolbox::ExecuteSystemCommand(command_, arguments); | |
| 127 | |
| 128 // Only chain with other commands if this operation succeeds | |
| 129 outputs.Append(input.Clone()); | |
| 130 } | |
| 131 catch (OrthancException& e) | |
| 132 { | |
|
2607
44e268605478
ModifyInstanceOperation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2606
diff
changeset
|
133 LOG(ERROR) << "Lua: Failed system call - \"" << info << "\": " << e.What(); |
| 2606 | 134 } |
| 135 } | |
|
2616
2f3007bf0708
event queues in Lua, serialization of sequence of operations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2608
diff
changeset
|
136 |
|
2f3007bf0708
event queues in Lua, serialization of sequence of operations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2608
diff
changeset
|
137 |
|
2f3007bf0708
event queues in Lua, serialization of sequence of operations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2608
diff
changeset
|
138 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
|
139 { |
| 2654 | 140 result = Json::objectValue; |
|
2616
2f3007bf0708
event queues in Lua, serialization of sequence of operations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2608
diff
changeset
|
141 result["Type"] = "SystemCall"; |
|
2f3007bf0708
event queues in Lua, serialization of sequence of operations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2608
diff
changeset
|
142 result["Command"] = command_; |
|
2656
a6d3e45eeff5
SerializationToolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2655
diff
changeset
|
143 SerializationToolbox::WriteArrayOfStrings(result, preArguments_, "PreArguments"); |
|
a6d3e45eeff5
SerializationToolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2655
diff
changeset
|
144 SerializationToolbox::WriteArrayOfStrings(result, postArguments_, "PostArguments"); |
| 2655 | 145 } |
|
2616
2f3007bf0708
event queues in Lua, serialization of sequence of operations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2608
diff
changeset
|
146 |
|
2f3007bf0708
event queues in Lua, serialization of sequence of operations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2608
diff
changeset
|
147 |
| 2655 | 148 SystemCallOperation::SystemCallOperation(const Json::Value& serialized) |
| 149 { | |
|
2656
a6d3e45eeff5
SerializationToolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2655
diff
changeset
|
150 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
|
151 { |
| 2655 | 152 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
|
153 } |
|
2f3007bf0708
event queues in Lua, serialization of sequence of operations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2608
diff
changeset
|
154 |
|
2656
a6d3e45eeff5
SerializationToolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2655
diff
changeset
|
155 command_ = SerializationToolbox::ReadString(serialized, "Command"); |
|
a6d3e45eeff5
SerializationToolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2655
diff
changeset
|
156 SerializationToolbox::ReadArrayOfStrings(preArguments_, serialized, "PreArguments"); |
|
a6d3e45eeff5
SerializationToolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2655
diff
changeset
|
157 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
|
158 } |
| 2606 | 159 } |