comparison OrthancFramework/Sources/DicomNetworking/Internals/GetScp.cpp @ 4284:756126cd2219

moving all logs from DicomNetworking folder into the "dicom" category
author Sebastien Jodogne <s.jodogne@gmail.com>
date Wed, 04 Nov 2020 15:01:47 +0100
parents 6f5d4bfb2c90
children 526bd8bad850
comparison
equal deleted inserted replaced
4283:6b58ceed959e 4284:756126cd2219
218 } 218 }
219 } 219 }
220 catch (OrthancException& e) 220 catch (OrthancException& e)
221 { 221 {
222 // Internal error! 222 // Internal error!
223 LOG(ERROR) << "IGetRequestHandler Failed: " << e.What(); 223 CLOG(ERROR, DICOM) << "IGetRequestHandler Failed: " << e.What();
224 response->DimseStatus = STATUS_GET_Failed_UnableToProcess; 224 response->DimseStatus = STATUS_GET_Failed_UnableToProcess;
225 return; 225 return;
226 } 226 }
227 227
228 data.lastRequest_ = requestIdentifiers; 228 data.lastRequest_ = requestIdentifiers;
229 } 229 }
230 else if (data.lastRequest_ != requestIdentifiers) 230 else if (data.lastRequest_ != requestIdentifiers)
231 { 231 {
232 // Internal error! 232 // Internal error!
233 LOG(ERROR) << "IGetRequestHandler Failed: Internal error lastRequestIdentifier"; 233 CLOG(ERROR, DICOM) << "IGetRequestHandler Failed: Internal error lastRequestIdentifier";
234 response->DimseStatus = STATUS_GET_Failed_UnableToProcess; 234 response->DimseStatus = STATUS_GET_Failed_UnableToProcess;
235 return; 235 return;
236 } 236 }
237 237
238 if (data.canceled_) 238 if (data.canceled_)
239 { 239 {
240 LOG(ERROR) << "IGetRequestHandler Failed: Cannot pursue a request that was canceled by the SCU"; 240 CLOG(ERROR, DICOM) << "IGetRequestHandler Failed: Cannot pursue a request that was canceled by the SCU";
241 response->DimseStatus = STATUS_GET_Failed_UnableToProcess; 241 response->DimseStatus = STATUS_GET_Failed_UnableToProcess;
242 return; 242 return;
243 } 243 }
244 244
245 if (data.handler_->GetSubOperationCount() == 245 if (data.handler_->GetSubOperationCount() ==
259 isContinue = data.handler_->DoNext(data.assoc_); 259 isContinue = data.handler_->DoNext(data.assoc_);
260 } 260 }
261 catch (OrthancException& e) 261 catch (OrthancException& e)
262 { 262 {
263 // Internal error! 263 // Internal error!
264 LOG(ERROR) << "IGetRequestHandler Failed: " << e.What(); 264 CLOG(ERROR, DICOM) << "IGetRequestHandler Failed: " << e.What();
265 FillResponse(*response, responseIdentifiers, *data.handler_); 265 FillResponse(*response, responseIdentifiers, *data.handler_);
266 266
267 // Fix the status code that is computed by "FillResponse()" 267 // Fix the status code that is computed by "FillResponse()"
268 response->DimseStatus = STATUS_GET_Failed_UnableToProcess; 268 response->DimseStatus = STATUS_GET_Failed_UnableToProcess;
269 return; 269 return;
309 309
310 // if some error occured, dump corresponding information and remove the outfile if necessary 310 // if some error occured, dump corresponding information and remove the outfile if necessary
311 if (cond.bad()) 311 if (cond.bad())
312 { 312 {
313 OFString temp_str; 313 OFString temp_str;
314 LOG(ERROR) << "Get SCP Failed: " << cond.text(); 314 CLOG(ERROR, DICOM) << "Get SCP Failed: " << cond.text();
315 } 315 }
316 316
317 return cond; 317 return cond;
318 } 318 }
319 } 319 }