adding verbose logging

update version to v1.0.7
knopkem · Sep 7, 2020 · ced82f2 · ced82f2
1 parent 37a6c22
commit ced82f2
Show file tree

Hide file tree

Showing 13 changed files with 44 additions and 11 deletions.
diff --git a/examples/echo.js b/examples/echo.js
@@ -11,7 +11,8 @@ addon.echoScu(JSON.stringify(
             "aet": "CONQUESTSRV1",
             "ip" : "127.0.0.1",
             "port": "5678"
-        }
+        },
+        "verbose": true
     }
 ), (result) => {
         if (result && result.length > 0) {

diff --git a/examples/find.js b/examples/find.js
@@ -25,7 +25,8 @@ addon.findScu(JSON.stringify(
                 "key": "00100010", 
                 "value": "",
             },
-        ]
+        ],
+        "verbose": true
     }
 ), (result) => {
         if (result && result.length > 0) {
@@ -39,7 +40,7 @@ addon.findScu(JSON.stringify(
             }
         }
 });
-
+/*
 addon.findScu(JSON.stringify(
     {
         "source": {
@@ -69,7 +70,8 @@ addon.findScu(JSON.stringify(
                 "key": "00200011", 
                 "value": "",
             },
-        ]
+        ],
+        "verbose": true
     }
 ), (result) => {
         if (result && result.length > 0) {
@@ -109,7 +111,8 @@ addon.findScu(JSON.stringify(
                 "key": "00080052", 
                 "value": "IMAGE",
             },
-        ]
+        ],
+        "verbose": true    
     }
 ), (result) => {
         if (result && result.length > 0) {
@@ -124,3 +127,4 @@ addon.findScu(JSON.stringify(
         }
 });
 
+*/
diff --git a/examples/get.js b/examples/get.js
@@ -21,7 +21,8 @@ addon.getScu(JSON.stringify(
                 "key": "00080052", 
                 "value": "STUDY",
             },
-        ]
+        ],
+        "verbose": true
     }
 ), (result) => {
         if (result && result.length > 0) {

diff --git a/examples/move.js b/examples/move.js
@@ -7,8 +7,9 @@ addon.startScp(JSON.stringify(
             "ip" : "127.0.0.1",
             "port": "9999"
         },
-	"storagePath": "./data"
-    }   
+        "storagePath": "./data",
+        "verbose": true
+    }
     ), (result) => {
         if (result && result.length > 0) {
             try
@@ -44,7 +45,8 @@ setTimeout(function() {
                     "value": "STUDY",
                 },
             ],
-            "destination" : "IMEBRA"
+            "destination" : "IMEBRA",
+            "verbose": true
         }
     ), (result) => {
         if (result && result.length > 0) {

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "dicom-dimse-native",
-  "version": "1.0.6",
+  "version": "1.0.7",
   "description": "native addon using DCMTK dicom toolkit",
   "main": "index.js",
   "scripts": {

diff --git a/src/BaseAsyncWorker.cc b/src/BaseAsyncWorker.cc
@@ -39,4 +39,13 @@ void BaseAsyncWorker::SendInfo(const std::string& msg, const ExecutionProgress&
 {
     std::string msg2 = ns::createJsonResponse(status, msg);
     progress.Send(msg2.c_str(), msg2.length());
-}
+}
+
+void BaseAsyncWorker::EnableVerboseLogging(bool enabled)
+{
+    if (enabled) {
+        OFLog::configure(OFLogger::INFO_LOG_LEVEL);
+    } else {
+        OFLog::configure(OFLogger::WARN_LOG_LEVEL);
+    }
+}
diff --git a/src/BaseAsyncWorker.h b/src/BaseAsyncWorker.h
@@ -23,6 +23,8 @@ class BaseAsyncWorker : public AsyncProgressWorker<char>
 
         void SendInfo(const std::string& msg, const ExecutionProgress& progress, ns::eStatus status = ns::PENDING);
 
+        void EnableVerboseLogging(bool enabled);
+
         std::string _input;
         nlohmann::json _jsonOutput;
         std::string _error;

diff --git a/src/EchoAsyncWorker.cc b/src/EchoAsyncWorker.cc
@@ -140,6 +140,8 @@ void EchoAsyncWorker::Execute(const ExecutionProgress &progress)
 {
     ns::sInput in = ns::parseInputJson(_input);
 
+    EnableVerboseLogging(in.verbose);
+
     if (!in.source.valid())
     {
         SetErrorJson("Source not set");

diff --git a/src/FindAsyncWorker.cc b/src/FindAsyncWorker.cc
@@ -112,6 +112,8 @@ void FindAsyncWorker::Execute(const ExecutionProgress &progress)
 {
     ns::sInput in = ns::parseInputJson(_input);
 
+    EnableVerboseLogging(in.verbose);
+
     if (in.tags.empty())
     {
         SetErrorJson("Tags not set");

diff --git a/src/GetAsyncWorker.cc b/src/GetAsyncWorker.cc
@@ -134,6 +134,8 @@ void GetAsyncWorker::Execute(const ExecutionProgress &progress)
 {
     ns::sInput in = ns::parseInputJson(_input);
 
+    EnableVerboseLogging(in.verbose);
+
     if (in.tags.empty())
     {
         SetErrorJson("Tags not set");

diff --git a/src/MoveAsyncWorker.cc b/src/MoveAsyncWorker.cc
@@ -138,6 +138,8 @@ void MoveAsyncWorker::Execute(const ExecutionProgress &progress)
 {
     ns::sInput in = ns::parseInputJson(_input);
 
+    EnableVerboseLogging(in.verbose);
+
     if (in.tags.empty())
     {
         SetErrorJson("Tags not set");

diff --git a/src/ServerAsyncWorker.cc b/src/ServerAsyncWorker.cc
@@ -396,6 +396,8 @@ void ServerAsyncWorker::Execute(const ExecutionProgress &progress)
 {
   ns::sInput in = ns::parseInputJson(_input);
 
+  EnableVerboseLogging(in.verbose);
+
   if (!in.source.valid())
   {
     SetErrorJson("Source not set");

diff --git a/src/Utils.h b/src/Utils.h
@@ -68,6 +68,7 @@ namespace ns {
         std::string storagePath;
         std::string destination;
         std::vector<sTag> tags;
+        bool verbose;
         inline bool valid() {
             return source.valid() && target.valid();
         }
@@ -121,6 +122,9 @@ namespace ns {
                 in.tags.push_back(tag);
             }
         } catch(...) {}
+        try {
+            in.verbose = j.at("verbose");
+        } catch(...) {}
         return in;
     }