Mercurial > hg > orthanc

changeset 4621:82dbe45c947a db-changes

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
integration mainline->db-changes
author Sebastien Jodogne <s.jodogne@gmail.com>
date Thu, 15 Apr 2021 11:29:57 +0200
parents fda80844b920 (current diff) 926fa5ef8b4f (diff)
children 9086aeb9d9d2
files
diffstat 1 files changed, 15 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/OrthancFramework/Sources/DicomNetworking/Internals/CommandDispatcher.cpp	Wed Apr 14 14:02:21 2021 +0200
+++ b/OrthancFramework/Sources/DicomNetworking/Internals/CommandDispatcher.cpp	Thu Apr 15 11:29:57 2021 +0200
@@ -654,9 +654,15 @@
           AssociationCleanup(assoc);
           return NULL;
         }
-        CLOG(INFO, DICOM) << "Association Acknowledged (Max Send PDV: " << assoc->sendPDVLength << ")";
-        if (ASC_countAcceptedPresentationContexts(assoc->params) == 0)
-          CLOG(INFO, DICOM) << "    (but no valid presentation contexts)";
+
+        {
+          std::string suffix;
+          if (ASC_countAcceptedPresentationContexts(assoc->params) == 0)
+            suffix = " (but no valid presentation contexts)";
+          
+          CLOG(INFO, DICOM) << "Association Acknowledged (Max Send PDV: " << assoc->sendPDVLength
+                            << ") to AET " << remoteAet << " on IP " << remoteIp << suffix;
+        }
 
         {
           OFString str;
@@ -908,24 +914,26 @@
         // the peer or a network error
         finished = true;
 
-        CLOG(INFO, DICOM) << cond.text();
+        CLOG(INFO, DICOM) << "Finishing association with AET " << remoteAet_
+                          << " on IP " << remoteIp_ << ": " << cond.text();
       }
     
       if (finished)
       {
         if (cond == DUL_PEERREQUESTEDRELEASE)
         {
-          CLOG(INFO, DICOM) << "Association Release";
+          CLOG(INFO, DICOM) << "Association Release with AET " << remoteAet_ << " on IP " << remoteIp_;
           ASC_acknowledgeRelease(assoc_);
         }
         else if (cond == DUL_PEERABORTEDASSOCIATION)
         {
-          CLOG(INFO, DICOM) << "Association Aborted";
+          CLOG(INFO, DICOM) << "Association Aborted with AET " << remoteAet_ << " on IP " << remoteIp_;
         }
         else
         {
           OFString temp_str;
-          CLOG(INFO, DICOM) << "DIMSE failure (aborting association): " << cond.text();
+          CLOG(INFO, DICOM) << "DIMSE failure (aborting association with AET " << remoteAet_
+                            << " on IP " << remoteIp_ << "): " << cond.text();
           /* some kind of error so abort the association */
           ASC_abortAssociation(assoc_);
         }