diff OrthancServer/OrthancInitialization.cpp @ 2955:bbfd95a0c429

cont
author Sebastien Jodogne <s.jodogne@gmail.com>
date Mon, 03 Dec 2018 14:59:23 +0100
parents 4767d36679ed
children 517fc4767ae0 4e43e67f8ecf
line wrap: on
line diff
--- a/OrthancServer/OrthancInitialization.cpp	Mon Dec 03 14:35:34 2018 +0100
+++ b/OrthancServer/OrthancInitialization.cpp	Mon Dec 03 14:59:23 2018 +0100
@@ -67,8 +67,8 @@
 
         if (!parameter[name].isInt())
         {
-          LOG(ERROR) << "Not a number in this user-defined metadata: " << name;
-          throw OrthancException(ErrorCode_BadParameterType);
+          throw OrthancException(ErrorCode_BadParameterType,
+                                 "Not a number in this user-defined metadata: " + name);
         }
 
         int metadata = parameter[name].asInt();        
@@ -119,8 +119,8 @@
         }
         else
         {
-          LOG(ERROR) << "Not a number in this user-defined attachment type: " << name;
-          throw OrthancException(ErrorCode_BadParameterType);
+          throw OrthancException(ErrorCode_BadParameterType,
+                                 "Not a number in this user-defined attachment type: " + name);
         }
 
         LOG(INFO) << "Registering user-defined attachment type: " << name << " (index " 
@@ -183,8 +183,9 @@
         !config.isMember("Module") ||
         config["Module"].type() != Json::stringValue)
     {
-      LOG(ERROR) << "No path to the PKCS#11 module (DLL or .so) is provided for HTTPS client authentication";
-      throw OrthancException(ErrorCode_BadFileFormat);
+      throw OrthancException(ErrorCode_BadFileFormat,
+                             "No path to the PKCS#11 module (DLL or .so) is provided "
+                             "for HTTPS client authentication");
     }
 
     std::string pin;
@@ -196,8 +197,8 @@
       }
       else
       {
-        LOG(ERROR) << "The PIN number in the PKCS#11 configuration must be a string";
-        throw OrthancException(ErrorCode_BadFileFormat);
+        throw OrthancException(ErrorCode_BadFileFormat,
+                               "The PIN number in the PKCS#11 configuration must be a string");
       }
     }
 
@@ -210,8 +211,8 @@
       }
       else
       {
-        LOG(ERROR) << "The Verbose option in the PKCS#11 configuration must be a Boolean";
-        throw OrthancException(ErrorCode_BadFileFormat);
+        throw OrthancException(ErrorCode_BadFileFormat,
+                               "The Verbose option in the PKCS#11 configuration must be a Boolean");
       }
     }